.github/workflows/ci.yaml

@@ -8,18 +8,20 @@ on:
     branches:
       - "main"
 
+env:
+  PREMAKE_VERSION: "5.0.0-beta2"
+
 jobs:
   build-test-linux:
-    strategy:
+    env:
-      matrix:
+      PREMAKE_CONFIG: gmake2
-        build_arch: [x86, x64]
     runs-on: ubuntu-latest
     container: ubuntu:24.04
     steps:
       - name: Install g++ and multilib
         run: |
           apt-get update
-          apt-get install -y wget tar git make gcc-13 g++-13 gcc-13-multilib g++-13-multilib
+          apt-get install -y git make gcc-13 g++-13 gcc-13-multilib g++-13-multilib
           update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
           update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
           update-alternatives --set gcc /usr/bin/gcc-13
@@ -30,18 +32,21 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Setup premake
+        uses: abel0b/setup-premake@v2.4
+        with:
+          version: ${{ env.PREMAKE_VERSION }}
+
       - name: Premake generate
         working-directory: ${{ github.workspace }}
-        env:
+        run: premake5 ${{ env.PREMAKE_CONFIG }}
-          PREMAKE_NO_PROMPT: 1
-        run: ./generate.sh
 
       - name: Build
         working-directory: ${{ github.workspace }}
-        run: make -C build -j$(nproc) config=release_${{ matrix.build_arch }} all
+        run: make -C build -j$(nproc) config=release_x86 all
 
       - name: Test
-        working-directory: ${{ github.workspace }}/build/lib/Release_${{ matrix.build_arch }}/tests
+        working-directory: ${{ github.workspace }}/build/lib/Release_x86/tests
         run: |
           ./ObjCommonTests
           ./ObjCompilingTests
@@ -51,14 +56,8 @@ jobs:
           ./ZoneCommonTests
 
   build-test-windows:
-    strategy:
+    env:
-      matrix:
+      PREMAKE_CONFIG: vs2022
-        build_arch: [x86, x64]
-        include:
-          - build_arch: x86
-            msbuild_config: Win32
-          - build_arch: x64
-            msbuild_config: x64
     runs-on: windows-latest
     steps:
       - name: Checkout repository
@@ -69,18 +68,21 @@ jobs:
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@v2.0.0
 
+      - name: Setup premake
+        uses: abel0b/setup-premake@v2.4
+        with:
+          version: ${{ env.PREMAKE_VERSION }}
+
       - name: Premake generate
         working-directory: ${{ github.workspace }}
-        env:
+        run: premake5 ${{ env.PREMAKE_CONFIG }}
-          PREMAKE_NO_PROMPT: 1
-        run: ./generate.bat
 
       - name: Build
         working-directory: ${{ github.workspace }}
-        run: msbuild /m /p:Configuration=Release /p:Platform=${{ matrix.msbuild_config }} build
+        run: msbuild /m /p:Configuration=Release /p:Platform=Win32 build
 
       - name: Test
-        working-directory: ${{ github.workspace }}/build/lib/Release_${{ matrix.build_arch }}/tests
+        working-directory: ${{ github.workspace }}/build/lib/Release_x86/tests
         run: |
           $combinedExitCode = 0
           ./ObjCommonTests

.github/workflows/release.yaml

@@ -5,15 +5,20 @@ on:
     tags:
       - "v*.*.*"
 
+env:
+  PREMAKE_VERSION: "5.0.0-beta2"
+
 jobs:
   build-release-linux:
+    env:
+      PREMAKE_CONFIG: gmake2
     runs-on: ubuntu-latest
     container: ubuntu:24.04
     steps:
       - name: Install g++ and multilib
         run: |
           apt-get update
-          apt-get install -y wget tar git make gcc-13 g++-13 gcc-13-multilib g++-13-multilib
+          apt-get install -y git make gcc-13 g++-13 gcc-13-multilib g++-13-multilib
           update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
           update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
           update-alternatives --set gcc /usr/bin/gcc-13
@@ -24,11 +29,14 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Setup premake
+        uses: abel0b/setup-premake@v2.4
+        with:
+          version: ${{ env.PREMAKE_VERSION }}
+
       - name: Premake generate
         working-directory: ${{ github.workspace }}
-        env:
+        run: premake5 ${{ env.PREMAKE_CONFIG }}
-          PREMAKE_NO_PROMPT: 1
-        run: ./generate.sh
 
       - name: Build
         working-directory: ${{ github.workspace }}
@@ -42,6 +50,8 @@ jobs:
             ${{ github.workspace }}/build/bin/Release_x86
 
   build-release-windows:
+    env:
+      PREMAKE_CONFIG: vs2022
     runs-on: windows-latest
     steps:
       - name: Checkout repository
@@ -52,11 +62,14 @@ jobs:
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@v2.0.0
 
+      - name: Setup premake
+        uses: abel0b/setup-premake@v2.4
+        with:
+          version: ${{ env.PREMAKE_VERSION }}
+
       - name: Premake generate
         working-directory: ${{ github.workspace }}
-        env:
+        run: premake5 ${{ env.PREMAKE_CONFIG }}
-          PREMAKE_NO_PROMPT: 1
-        run: ./generate.bat
 
       - name: Build
         working-directory: ${{ github.workspace }}

.gitmodules

@@ -16,6 +16,3 @@
 [submodule "thirdparty/eigen"]
 	path = thirdparty/eigen
 	url = https://gitlab.com/libeigen/eigen.git
-[submodule "thirdparty/lz4"]
-	path = thirdparty/lz4
-	url = https://github.com/lz4/lz4.git

docs/SupportedAssetTypes.md

@@ -13,7 +13,7 @@ The following section specify which assets are supported to be dumped to disk (u
 | -------------------- | --------------- | --------------- | ----------------------------------------------------------------- |
 | PhysPreset           | ❌              | ❌              |                                                                   |
 | XAnimParts           | ❌              | ❌              |                                                                   |
-| XModel               | ⁉️              | ❌              | Model data can be exported to `XMODEL_EXPORT/XMODEL_BIN`, `OBJ`, `GLB/GLTF`. |
+| XModel               | ⁉️              | ❌              | Model data can be exported to `XMODEL_EXPORT`, `OBJ`, `GLB/GLTF`. |
 | Material             | ❌              | ❌              |                                                                   |
 | MaterialTechniqueSet | ❌              | ❌              |                                                                   |
 | GfxImage             | ✅              | ✅              |                                                                   |
@@ -44,7 +44,7 @@ The following section specify which assets are supported to be dumped to disk (u
 | PhysPreset                | ✅              | ✅              |                                                                         |
 | PhysCollmap               | ❌              | ❌              |                                                                         |
 | XAnimParts                | ❌              | ❌              |                                                                         |
-| XModel                    | ⁉️              | ❌              | Model data can be exported to `XMODEL_EXPORT/XMODEL_BIN`, `OBJ`, `GLB/GLTF`.       |
+| XModel                    | ⁉️              | ❌              | Model data can be exported to `XMODEL_EXPORT`, `OBJ`, `GLB/GLTF`.       |
 | Material                  | ❌              | ❌              |                                                                         |
 | MaterialPixelShader       | ✅              | ✅              | Shaders are compiled. Only dumps/loads shader bytecode.                 |
 | MaterialVertexShader      | ✅              | ✅              | Shaders are compiled. Only dumps/loads shader bytecode.                 |
@@ -85,7 +85,7 @@ The following section specify which assets are supported to be dumped to disk (u
 | PhysCollmap               | ❌              | ❌              |                                                                                                               |
 | XAnimParts                | ❌              | ❌              |                                                                                                               |
 | XModelSurfs               | ❌              | ❌              |                                                                                                               |
-| XModel                    | ⁉️              | ❌              | Model data can be exported to `XMODEL_EXPORT/XMODEL_BIN`, `OBJ`, `GLB/GLTF`.                                             |
+| XModel                    | ⁉️              | ❌              | Model data can be exported to `XMODEL_EXPORT`, `OBJ`, `GLB/GLTF`.                                             |
 | Material                  | ❌              | ❌              |                                                                                                               |
 | MaterialPixelShader       | ❌              | ❌              |                                                                                                               |
 | MaterialVertexShader      | ❌              | ❌              |                                                                                                               |
@@ -130,7 +130,7 @@ The following section specify which assets are supported to be dumped to disk (u
 | PhysConstraints      | ❌              | ❌              |                                                                   |
 | DestructibleDef      | ❌              | ❌              |                                                                   |
 | XAnimParts           | ❌              | ❌              |                                                                   |
-| XModel               | ⁉️              | ❌              | Model data can be exported to `XMODEL_EXPORT/XMODEL_BIN`, `OBJ`, `GLB/GLTF`. |
+| XModel               | ⁉️              | ❌              | Model data can be exported to `XMODEL_EXPORT`, `OBJ`, `GLB/GLTF`. |
 | Material             | ❌              | ❌              |                                                                   |
 | MaterialTechniqueSet | ❌              | ❌              |                                                                   |
 | GfxImage             | ✅              | ❌              | A few special image encodings are not yet supported.              |
@@ -167,7 +167,7 @@ The following section specify which assets are supported to be dumped to disk (u
 | PhysConstraints        | ✅              | ✅              |                                                                                                                                                                |
 | DestructibleDef        | ❌              | ❌              |                                                                                                                                                                |
 | XAnimParts             | ❌              | ❌              |                                                                                                                                                                |
-| XModel                 | ✅              | ✅              | Model data can be exported to `XMODEL_EXPORT/XMODEL_BIN`, `OBJ`, `GLB/GLTF`.                                                                                              |
+| XModel                 | ✅              | ✅              | Model data can be exported to `XMODEL_EXPORT`, `OBJ`, `GLB/GLTF`.                                                                                              |
 | Material               | ⁉️              | ⁉️              | Dumping/Loading is currently possible for materials in their compiled form. There is currently no material pipeline.                                           |
 | MaterialTechniqueSet   | ⁉️              | ❌              | Only dumps compiled shaders.                                                                                                                                   |
 | GfxImage               | ✅              | ✅              | A few special image encodings are not yet supported.                                                                                                           |
@@ -177,7 +177,7 @@ The following section specify which assets are supported to be dumped to disk (u
 | ComWorld               | ❌              | ❌              |                                                                                                                                                                |
 | GameWorldSp            | ❌              | ❌              |                                                                                                                                                                |
 | GameWorldMp            | ❌              | ❌              |                                                                                                                                                                |
-| MapEnts                | ✅              | ❌              |                                                                                                                                                                |
+| MapEnts                | ❌              | ❌              |                                                                                                                                                                |
 | GfxWorld               | ❌              | ❌              |                                                                                                                                                                |
 | GfxLightDef            | ❌              | ❌              |                                                                                                                                                                |
 | Font_s                 | ❌              | ❌              |                                                                                                                                                                |

generate.bat

@@ -1,88 +1,6 @@
 @echo off
 
-set PREMAKE_URL="https://github.com/premake/premake-core/releases/download/v5.0.0-beta6/premake-5.0.0-beta6-windows.zip"
-set PREMAKE_HASH="c34a6e0b15f119f6284886298fdd8df543af87ad16f3ce5f4d0a847be2a88343"
-
-@REM The following variables can be set:
-@REM    PREMAKE_NO_GLOBAL - Ignore premake5 executable from path
-@REM    PREMAKE_NO_PROMPT - Download premake5 without prompting
-
-goto start
-
-:downloadpremake
-
-if not exist "build" mkdir "build"
-
-where /q "pwsh"
-IF NOT ERRORLEVEL 1 (
-    set POWERSHELL_BIN="pwsh"
-) else (
-    set POWERSHELL_BIN="powershell"
-)
-
-echo Downloading...
-%POWERSHELL_BIN% -NoProfile -NonInteractive -Command "Invoke-WebRequest %PREMAKE_URL% -OutFile build/premake.zip"
-IF ERRORLEVEL 1 (
-    echo Download failed >&2
-    exit 2
-)
-
-echo Extracting...
-%POWERSHELL_BIN% -NoProfile -NonInteractive -Command "Expand-Archive -LiteralPath build/premake.zip -DestinationPath build -Force"
-IF ERRORLEVEL 1 (
-    echo Extraction failed >&2
-    exit 2
-)
-
-rm build/premake.zip
-
-echo Verifying hash...
-%POWERSHELL_BIN% -NoProfile -NonInteractive -Command "if ((Get-FileHash -LiteralPath build/premake5.exe -Algorithm SHA256).Hash -eq \"%PREMAKE_HASH%\") { exit 0 } else { exit 1 }"
-IF ERRORLEVEL 1 (
-    echo Hash verification failed >&2
-    rm build/premake5.exe
-    exit 2
-)
-
-exit /B 0
-
 cd %~dp0
 
-:start
-
-IF "%PREMAKE_NO_GLOBAL%" EQU "" (
-    where /Q "premake5.exe"
-    IF NOT ERRORLEVEL 1 (
-        set PREMAKE_BIN="premake5.exe"
-        goto runpremake
-    )
-)
-
-IF EXIST build/premake5.exe (
-    build\premake5.exe --version >NUL
-    IF NOT ERRORLEVEL 1 (
-        set PREMAKE_BIN="build/premake5.exe"
-        goto runpremake
-    )
-)
-
-if "%PREMAKE_NO_PROMPT%" NEQ "" (
-    call:downloadpremake
-    set PREMAKE_BIN="build/premake5.exe"
-    goto runpremake
-)
-
-echo Could not find premake5. You can either install it yourself or this script download it for you.
-set /p choice="Do you wish to download it automatically? [y/N]> "
-if /i "%choice%" == "y" (
-    call:downloadpremake
-    set PREMAKE_BIN="build/premake5.exe"
-    goto runpremake
-)
-
-echo Please install premake5 and try again
-exit 1
-
-:runpremake
 git submodule update --init --recursive
-%PREMAKE_BIN% %* vs2022
+tools\premake5.exe %* vs2022

generate.sh

@@ -1,80 +1,7 @@
 #!/bin/bash
 
-PREMAKE_URL='https://github.com/premake/premake-core/releases/download/v5.0.0-beta6/premake-5.0.0-beta6-linux.tar.gz'
-PREMAKE_HASH='fade2839ace1a2953556693e6f3d8f9b8b2897894b5a1f2ad477cdf8e9af042a'
-
-# The following variables can be set:
-#     PREMAKE_NO_GLOBAL - Ignore premake5 executable from path
-#     PREMAKE_NO_PROMPT - Download premake5 without prompting
-
-function install_premake {
-    if [[ ! -x "$(command -v wget)" ]]; then
-        echo "Failed: Installation requires wget" >&2
-        exit 2
-    fi
-    if [[ ! -x "$(command -v tar)" ]]; then
-        echo "Failed: Installation requires tar" >&2
-        exit 2
-    fi
-    if [[ ! -x "$(command -v sha256sum)" ]]; then
-        echo "Failed: Installation requires sha256sum" >&2
-        exit 2
-    fi
-
-    mkdir -p build
-    wget -nd -O build/premake.tar.gz "$PREMAKE_URL"
-    if [[ $? -ne 0 ]]; then
-        echo "Download failed" >&2
-        exit 2
-    fi
-
-    tar -xf build/premake.tar.gz -C build
-    if [[ $? -ne 0 ]]; then
-        echo "Extraction failed" >&2
-        exit 2
-    fi
-
-    rm build/premake.tar.gz
-
-    echo "${PREMAKE_HASH} build/premake5" | sha256sum -c
-    if [[ $? -ne 0 ]]; then
-        echo "Hash verification failed" >&2
-        rm build/premake5
-        exit 2
-    fi
-
-    chmod +x build/premake5
-}
-
-function expect_inside_git_repository {
-    inside_git_repo="$(git rev-parse --is-inside-work-tree 2>/dev/null)"
-    if [ ! -d ".git" ] && [ ! "$inside_git_repo" ]; then
-        echo "You must clone the OpenAssetTools repository using 'git clone'. Please read README.md." >&2
-        exit 1
-    fi
-}
-
 # Go to repository root
 cd "$(dirname "$0")" || exit 2
 
-expect_inside_git_repository
-
-PREMAKE_BIN=''
-if [[ -z "$PREMAKE_NO_GLOBAL" ]] && [[ -x "$(command -v premake5)" ]]; then
-    PREMAKE_BIN='premake5'
-elif [[ -x "$(command -v build/premake5)" ]] && [[ ! -z "$(build/premake5 --version)" ]]; then
-    PREMAKE_BIN='build/premake5'
-else
-    echo "Could not find premake5. You can either install it yourself or this script download it for you."
-    if [[ ! -z "$PREMAKE_NO_PROMPT" ]] || [[ "$(read -e -p 'Do you wish to download it automatically? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then
-        echo "Installing premake"
-        install_premake
-        PREMAKE_BIN='build/premake5'
-    else
-        echo "Please install premake5 and try again"
-        exit 1
-    fi
-fi
-
 git submodule update --init --recursive
-$PREMAKE_BIN $@ gmake
+tools/premake5 $@ gmake2

premake5.lua

@@ -1,5 +1,3 @@
-require("premake", ">=5.0.0-beta5")
-
 include "tools/scripts/folders.lua"
 include "tools/scripts/including.lua"
 include "tools/scripts/linking.lua"
@@ -16,7 +14,7 @@ workspace "OpenAssetTools"
     objdir "%{wks.location}/obj"
     symbols "On"
     systemversion "latest"
-    cppdialect "C++23"
+    cppdialect "C++20"
     largeaddressaware "on"
 
 	flags {
@@ -54,15 +52,13 @@ workspace "OpenAssetTools"
         symbols "On"
     filter {}
 
-    filter {"system:windows", "configurations:Debug" }
-        buildoptions { "/bigobj" }
-    filter {}
-
     filter "configurations:Release"
         defines "NDEBUG"
         optimize "Full"
         symbols "Off"
-        fatalwarnings { "All" }
+        flags {
+            "FatalWarnings"
+        }
     filter {}
 
     defines {
@@ -97,7 +93,6 @@ include "thirdparty/minilzo.lua"
 include "thirdparty/minizip.lua"
 include "thirdparty/salsa20.lua"
 include "thirdparty/zlib.lua"
-include "thirdparty/lz4.lua"
 
 -- ThirdParty group: All projects that are external dependencies
 group "ThirdParty"
@@ -110,14 +105,13 @@ group "ThirdParty"
     minizip:project()
     salsa20:project()
     zlib:project()
-    lz4:project()
 group ""
 
 -- ========================
 -- Projects
 -- ========================
 include "src/Common.lua"
-include "src/Cryptography.lua"
+include "src/Crypto.lua"
 include "src/ImageConverter.lua"
 include "src/Linker.lua"
 include "src/Parser.lua"
@@ -141,7 +135,7 @@ include "tools/scripts/raw.lua"
 -- Components group: All projects assist or are part of a tool
 group "Components"
     Common:project()
-    Cryptography:project()
+    Crypto:project()
     Parser:project()
     Utils:project()
     ZoneCode:project()

scripts/build.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Go to repository root
-cd "$(dirname "$0")/.." || exit 2
-
-TARGET='all'
-ARCHITECTURE='x86'
-CONFIG='debug'
-
-for var in "$@"
-do
-    if [ "$var" == "debug" ] || [ "$var" == "release" ]; then
-        CONFIG="$var"
-    elif [ "$var" == "x86" ] || [ "$var" == "x64" ]; then
-        ARCHITECTURE="$var"
-    else
-        TARGET="$var"
-    fi
-done
-
-echo "Building config=${CONFIG} architecture=${ARCHITECTURE} target=${TARGET}"
-make -C build -j$(nproc) config=${CONFIG}_${ARCHITECTURE} "${TARGET}"
-

scripts/make-clean.sh

@@ -5,5 +5,3 @@ cd "$(dirname "$0")/.." || exit 2
 
 make -C build -j$(nproc) config=debug_x86 clean
 make -C build -j$(nproc) config=release_x86 clean
-make -C build -j$(nproc) config=debug_x64 clean
-make -C build -j$(nproc) config=release_x64 clean

src/Common/Game/IW3/IW3_Assets.h

@@ -135,7 +135,7 @@ namespace IW3
     typedef float vec2_t[2];
     typedef float vec3_t[3];
     typedef float vec4_t[4];
-    typedef tdef_align32(128) unsigned int raw_uint128;
+    typedef tdef_align(128) unsigned int raw_uint128;
 
     struct XModelPiece
     {
@@ -179,7 +179,7 @@ namespace IW3
     };
 
     typedef unsigned char ByteVec[3];
-    typedef tdef_align32(4) unsigned short UShortVec[3];
+    typedef tdef_align(4) unsigned short UShortVec[3];
 
     union XAnimDynamicIndicesTrans
     {
@@ -214,7 +214,7 @@ namespace IW3
         XAnimPartTransData u;
     };
 
-    typedef tdef_align32(4) short XQuat[2];
+    typedef tdef_align(4) short XQuat[2];
 
     union XAnimDynamicIndicesQuat
     {
@@ -360,7 +360,7 @@ namespace IW3
         uint16_t* vertsBlend;
     };
 
-    typedef tdef_align32(16) uint16_t r_index16_t;
+    typedef tdef_align(16) uint16_t r_index16_t;
 
     struct XSurface
     {
@@ -709,7 +709,7 @@ namespace IW3
         MaterialTextureDefInfo u;
     };
 
-    struct gcc_align32(8) GfxDrawSurfFields
+    struct gcc_align(8) GfxDrawSurfFields
     {
         uint64_t objectId : 16;
         uint64_t reflectionProbeIndex : 8;
@@ -724,8 +724,8 @@ namespace IW3
 
     union GfxDrawSurf
     {
-        gcc_align32(8) GfxDrawSurfFields fields;
+        gcc_align(8) GfxDrawSurfFields fields;
-        gcc_align32(8) uint64_t packed;
+        gcc_align(8) uint64_t packed;
     };
 
     enum materialSurfType_t
@@ -1314,9 +1314,9 @@ namespace IW3
     {
         char levelCount;
         char flags;
-        uint16_t dimensions[3];
+        int16_t dimensions[3];
         int format;
-        unsigned int resourceSize;
+        int resourceSize;
         char data[1];
     };
 
@@ -1605,7 +1605,7 @@ namespace IW3
         cLeaf_t leaf;
     };
 
-    struct type_align32(16) cbrush_t
+    struct type_align(16) cbrush_t
     {
         float mins[3];
         int contents;
@@ -1671,7 +1671,7 @@ namespace IW3
 
     typedef unsigned short LeafBrush;
 
-    typedef tdef_align32(16) cbrush_t cbrush_array_t;
+    typedef tdef_align(16) cbrush_t cbrush_array_t;
 
     struct clipMap_t
     {
@@ -2265,7 +2265,7 @@ namespace IW3
         char pad;
     };
 
-    typedef tdef_align32(4) GfxSceneDynModel GfxSceneDynModel4;
+    typedef tdef_align(4) GfxSceneDynModel GfxSceneDynModel4;
 
     struct GfxWorld
     {

src/Common/Game/IW4/IW4_Assets.h

@@ -155,10 +155,10 @@ namespace IW4
         void* data;
     };
 
-    typedef tdef_align32(16) char raw_byte16;
+    typedef tdef_align(16) char raw_byte16;
-    typedef tdef_align32(16) float raw_float16;
+    typedef tdef_align(16) float raw_float16;
     typedef unsigned int raw_uint;
-    typedef tdef_align32(128) unsigned int raw_uint128;
+    typedef tdef_align(128) unsigned int raw_uint128;
     typedef unsigned char cbrushedge_t;
     typedef unsigned short r_index_t;
     typedef float vec2_t[2];
@@ -289,7 +289,7 @@ namespace IW4
     };
 
     typedef unsigned char ByteVec[3];
-    typedef tdef_align32(4) unsigned short UShortVec[3];
+    typedef tdef_align(4) unsigned short UShortVec[3];
 
     union XAnimDynamicFrames
     {
@@ -303,7 +303,7 @@ namespace IW4
         uint16_t _2[1];
     };
 
-    struct type_align32(4) XAnimPartTransFrames
+    struct type_align(4) XAnimPartTransFrames
     {
         float mins[3];
         float size[3];
@@ -330,9 +330,9 @@ namespace IW4
         uint16_t _2[1];
     };
 
-    typedef tdef_align32(4) short XQuat2[2];
+    typedef tdef_align(4) short XQuat2[2];
 
-    struct type_align32(4) XAnimDeltaPartQuatDataFrames2
+    struct type_align(4) XAnimDeltaPartQuatDataFrames2
     {
         XQuat2* frames;
         XAnimDynamicIndicesQuat2 indices;
@@ -356,7 +356,7 @@ namespace IW4
         uint16_t _2[1];
     };
 
-    typedef tdef_align32(4) short XQuat[4];
+    typedef tdef_align(4) short XQuat[4];
 
     struct XAnimDeltaPartQuatDataFrames
     {
@@ -489,7 +489,7 @@ namespace IW4
         XSurfaceCollisionTree* collisionTree;
     };
 
-    typedef tdef_align32(16) uint16_t r_index16_t;
+    typedef tdef_align(16) uint16_t r_index16_t;
 
     struct XSurface
     {
@@ -843,7 +843,7 @@ namespace IW4
         unsigned int toolFlags;
     };
 
-    struct gcc_align32(8) GfxDrawSurfFields
+    struct gcc_align(8) GfxDrawSurfFields
     {
         uint64_t objectId : 16;
         uint64_t reflectionProbeIndex : 8;
@@ -860,8 +860,8 @@ namespace IW4
 
     union GfxDrawSurf
     {
-        gcc_align32(8) GfxDrawSurfFields fields;
+        gcc_align(8) GfxDrawSurfFields fields;
-        gcc_align32(8) uint64_t packed;
+        gcc_align(8) uint64_t packed;
     };
 
     // The sort key is translated to a numeric value inside the material templates
@@ -993,7 +993,7 @@ namespace IW4
         GfxStateBits* stateBitsTable;
     };
 
-    struct type_align32(4) GfxImageLoadDef
+    struct type_align(4) GfxImageLoadDef
     {
         char levelCount;
         char pad[3];
@@ -2918,8 +2918,8 @@ namespace IW4
         float linkMaxs[2];
     };
 
-    typedef tdef_align32(128) cbrush_t cbrush_array_t;
+    typedef tdef_align(128) cbrush_t cbrush_array_t;
-    typedef tdef_align32(128) Bounds BoundsArray;
+    typedef tdef_align(128) Bounds BoundsArray;
 
     struct clipMap_t
     {
@@ -3539,7 +3539,7 @@ namespace IW4
         Bounds bounds;
     };
 
-    struct type_align32(4) GfxBrushModel
+    struct type_align(4) GfxBrushModel
     {
         GfxBrushModelWritable writable;
         Bounds bounds;
@@ -3744,8 +3744,8 @@ namespace IW4
         int exponent;
     };
 
-    typedef tdef_align32(128) GfxCellTree GfxCellTree128;
+    typedef tdef_align(128) GfxCellTree GfxCellTree128;
-    typedef tdef_align32(4) GfxSceneDynModel GfxSceneDynModel4;
+    typedef tdef_align(4) GfxSceneDynModel GfxSceneDynModel4;
 
     struct GfxWorld
     {

src/Common/Game/IW5/IW5_Assets.h

@@ -221,9 +221,9 @@ namespace IW5
         };
     };
 
-    typedef tdef_align32(16) char raw_byte16;
+    typedef tdef_align(16) char raw_byte16;
-    typedef tdef_align32(16) float raw_float16;
+    typedef tdef_align(16) float raw_float16;
-    typedef tdef_align32(128) unsigned int raw_uint128;
+    typedef tdef_align(128) unsigned int raw_uint128;
     typedef unsigned char raw_byte;
     typedef unsigned int raw_uint;
     typedef unsigned short r_index_t;
@@ -338,7 +338,7 @@ namespace IW5
     };
 
     typedef unsigned char ByteVec[3];
-    typedef tdef_align32(4) unsigned short UShortVec[3];
+    typedef tdef_align(4) unsigned short UShortVec[3];
 
     union XAnimDynamicFrames
     {
@@ -352,7 +352,7 @@ namespace IW5
         uint16_t _2[1];
     };
 
-    struct type_align32(4) XAnimPartTransFrames
+    struct type_align(4) XAnimPartTransFrames
     {
         float mins[3];
         float size[3];
@@ -379,9 +379,9 @@ namespace IW5
         uint16_t _2[1];
     };
 
-    typedef tdef_align32(4) short XQuat2[2];
+    typedef tdef_align(4) short XQuat2[2];
 
-    struct type_align32(4) XAnimDeltaPartQuatDataFrames2
+    struct type_align(4) XAnimDeltaPartQuatDataFrames2
     {
         XQuat2* frames;
         XAnimDynamicIndicesQuat2 indices;
@@ -405,7 +405,7 @@ namespace IW5
         uint16_t _2[1];
     };
 
-    typedef tdef_align32(4) short XQuat[4];
+    typedef tdef_align(4) short XQuat[4];
 
     struct XAnimDeltaPartQuatDataFrames
     {
@@ -543,7 +543,7 @@ namespace IW5
         uint16_t i[3];
     };
 
-    typedef tdef_align32(16) XSurfaceTri XSurfaceTri16;
+    typedef tdef_align(16) XSurfaceTri XSurfaceTri16;
 
     struct XSurface
     {
@@ -653,7 +653,7 @@ namespace IW5
         float quantization;
     };
 
-    struct gcc_align32(8) GfxDrawSurfFields
+    struct gcc_align(8) GfxDrawSurfFields
     {
         uint64_t unused : 1;
         uint64_t primarySortKey : 6;
@@ -671,8 +671,8 @@ namespace IW5
 
     union GfxDrawSurf
     {
-        gcc_align32(8) GfxDrawSurfFields fields;
+        gcc_align(8) GfxDrawSurfFields fields;
-        gcc_align32(8) uint64_t packed;
+        gcc_align(8) uint64_t packed;
     };
 
     enum MaterialGameFlags
@@ -1127,7 +1127,7 @@ namespace IW5
         MaterialTechnique* techniques[54];
     };
 
-    struct type_align32(4) GfxImageLoadDef
+    struct type_align(4) GfxImageLoadDef
     {
         char levelCount;
         char pad[3];
@@ -1339,8 +1339,8 @@ namespace IW5
         unsigned char edgeCount[2][3];
     };
 
-    typedef tdef_align32(128) cbrush_t cbrush_array_t;
+    typedef tdef_align(128) cbrush_t cbrush_array_t;
-    typedef tdef_align32(128) Bounds BoundsArray;
+    typedef tdef_align(128) Bounds BoundsArray;
 
     struct ClipInfo
     {
@@ -2190,7 +2190,7 @@ namespace IW5
         Bounds bounds;
     };
 
-    struct type_align32(4) GfxBrushModel
+    struct type_align(4) GfxBrushModel
     {
         GfxBrushModelWritable writable;
         Bounds bounds;
@@ -2396,7 +2396,7 @@ namespace IW5
         int exponent;
     };
 
-    typedef tdef_align32(128) GfxCellTree GfxCellTree128;
+    typedef tdef_align(128) GfxCellTree GfxCellTree128;
 
     struct GfxWorld
     {
@@ -3446,7 +3446,7 @@ namespace IW5
         SndAliasCustom projIgnitionSound;
     };
 
-    typedef tdef_align32(4) AttSight AttSight4;
+    typedef tdef_align(4) AttSight AttSight4;
 
     struct WeaponAttachment
     {

src/Common/Game/T5/T5_Assets.h

@@ -193,20 +193,20 @@ namespace T5
         void* data;
     };
 
-    typedef tdef_align32(16) char char16;
+    typedef tdef_align(16) char char16;
-    typedef tdef_align32(32) char byte32;
+    typedef tdef_align(32) char byte32;
-    typedef tdef_align32(128) char byte128;
+    typedef tdef_align(128) char byte128;
 
-    typedef tdef_align32(4) char char_align4;
+    typedef tdef_align(4) char char_align4;
-    typedef tdef_align32(128) char char_align128;
+    typedef tdef_align(128) char char_align128;
 
-    typedef tdef_align32(16) char raw_byte16;
+    typedef tdef_align(16) char raw_byte16;
-    typedef tdef_align32(128) char raw_byte128;
+    typedef tdef_align(128) char raw_byte128;
 
-    typedef tdef_align32(128) float float_align128;
+    typedef tdef_align(128) float float_align128;
 
     typedef char cbrushedge_t;
-    typedef tdef_align32(128) unsigned int raw_uint128;
+    typedef tdef_align(128) unsigned int raw_uint128;
 
     typedef uint16_t ScriptString;
 
@@ -350,7 +350,7 @@ namespace T5
     };
 
     typedef unsigned char ByteVec[3];
-    typedef tdef_align32(4) unsigned short UShortVec[3];
+    typedef tdef_align(4) unsigned short UShortVec[3];
 
     union XAnimDynamicFrames
     {
@@ -385,7 +385,7 @@ namespace T5
         XAnimPartTransData u;
     };
 
-    typedef tdef_align32(4) short XQuat[2];
+    typedef tdef_align(4) short XQuat[2];
 
     union XAnimDynamicIndicesQuat
     {
@@ -542,7 +542,7 @@ namespace T5
         uint16_t i[3];
     };
 
-    typedef tdef_align32(16) XSurfaceTri XSurfaceTri16;
+    typedef tdef_align(16) XSurfaceTri XSurfaceTri16;
 
     struct XSurface
     {
@@ -627,7 +627,7 @@ namespace T5
         int sflags;
     };
 
-    struct type_align32(16) BrushWrapper
+    struct type_align(16) BrushWrapper
     {
         vec3_t mins;
         int contents;
@@ -650,7 +650,7 @@ namespace T5
         vec3_t halfLengths;
     };
 
-    typedef tdef_align32(16) PhysGeomInfo PhysGeomInfo16;
+    typedef tdef_align(16) PhysGeomInfo PhysGeomInfo16;
 
     struct PhysGeomList
     {
@@ -713,7 +713,7 @@ namespace T5
         PhysConstraints* physConstraints;
     };
 
-    struct gcc_align32(8) GfxDrawSurfFields
+    struct gcc_align(8) GfxDrawSurfFields
     {
         uint64_t objectId : 16;
         uint64_t fade : 4;
@@ -732,8 +732,8 @@ namespace T5
 
     union GfxDrawSurf
     {
-        gcc_align32(8) GfxDrawSurfFields fields;
+        gcc_align(8) GfxDrawSurfFields fields;
-        gcc_align32(8) uint64_t packed;
+        gcc_align(8) uint64_t packed;
     };
 
     struct MaterialInfo
@@ -1138,7 +1138,7 @@ namespace T5
         SND_ASSET_FLAG_PAD_LOOP_BUFFER = 0x2,
     };
 
-    typedef tdef_align32(2048) char snd_align_char;
+    typedef tdef_align(2048) char snd_align_char;
 
     struct snd_asset
     {
@@ -1164,7 +1164,7 @@ namespace T5
         snd_asset sound;
     };
 
-    typedef tdef_align32(2048) char char_align_2048;
+    typedef tdef_align(2048) char char_align_2048;
 
     struct PrimedSound
     {
@@ -1426,7 +1426,7 @@ namespace T5
         cLeaf_s leaf;
     };
 
-    struct type_align32(16) cbrush_t
+    struct type_align(16) cbrush_t
     {
         float mins[3];
         int contents;
@@ -1935,7 +1935,7 @@ namespace T5
         };
     };
 
-    struct type_align32(16) GfxLight
+    struct type_align(16) GfxLight
     {
         char type;
         char canUseShadowMap;
@@ -2142,7 +2142,7 @@ namespace T5
         char rgb[56][3];
     };
 
-    typedef tdef_align32(4) char aligned_byte_pointer;
+    typedef tdef_align(4) char aligned_byte_pointer;
 
     struct GfxLightGrid
     {
@@ -2220,7 +2220,7 @@ namespace T5
         uint16_t dynEntId;
     };
 
-    typedef tdef_align32(4) GfxSceneDynModel GfxSceneDynModel4;
+    typedef tdef_align(4) GfxSceneDynModel GfxSceneDynModel4;
 
     struct BModelDrawInfo
     {
@@ -2283,7 +2283,7 @@ namespace T5
         int stream2ByteOffset;
     };
 
-    struct type_align32(16) GfxSurface
+    struct type_align(16) GfxSurface
     {
         srfTriangles_t tris;
         Material* material;
@@ -2935,7 +2935,7 @@ namespace T5
         ITEM_TYPE_MENUMODEL = 0x27
     };
 
-    struct type_align32(8) itemDef_s
+    struct type_align(8) itemDef_s
     {
         windowDef_t window;
         int type;
@@ -2949,15 +2949,15 @@ namespace T5
         menuDef_t* parent;
         rectData_s* rectExpData;
         ExpressionStatement visibleExp;
-        gcc_align32(8) uint64_t showBits;
+        gcc_align(8) uint64_t showBits;
-        gcc_align32(8) uint64_t hideBits;
+        gcc_align(8) uint64_t hideBits;
         ExpressionStatement forecolorAExp;
         int ui3dWindowId;
         GenericEventHandler* onEvent;
         UIAnimInfo* animInfo;
     };
 
-    struct type_align32(8) menuDef_t
+    struct type_align(8) menuDef_t
     {
         windowDef_t window;
         const char* font;
@@ -2984,8 +2984,8 @@ namespace T5
         GenericEventHandler* onEvent;
         ItemKeyHandler* onKey;
         ExpressionStatement visibleExp;
-        gcc_align32(8) uint64_t showBits;
+        gcc_align(8) uint64_t showBits;
-        gcc_align32(8) uint64_t hideBits;
+        gcc_align(8) uint64_t hideBits;
         const char* allowedBinding;
         const char* soundName;
         int imageTrack;

src/Common/Game/T6/T6_Assets.h

@@ -10,17 +10,17 @@ namespace T6
 {
 #endif
 
-    typedef tdef_align32(16) char char16;
+    typedef tdef_align(16) char char16;
-    typedef tdef_align32(32) char byte32;
+    typedef tdef_align(32) char byte32;
-    typedef tdef_align32(128) char byte128;
+    typedef tdef_align(128) char byte128;
 
-    typedef tdef_align32(4) char char_align4;
+    typedef tdef_align(4) char char_align4;
-    typedef tdef_align32(128) char char_align128;
+    typedef tdef_align(128) char char_align128;
 
-    typedef tdef_align32(16) char raw_byte16;
+    typedef tdef_align(16) char raw_byte16;
-    typedef tdef_align32(128) char raw_byte128;
+    typedef tdef_align(128) char raw_byte128;
 
-    typedef tdef_align32(128) float float_align128;
+    typedef tdef_align(128) float float_align128;
 
     typedef uint16_t ScriptString;
 
@@ -643,7 +643,7 @@ namespace T6
         float lightingOriginRange;
     };
 
-    struct gcc_align32(8) GfxDrawSurfFields
+    struct gcc_align(8) GfxDrawSurfFields
     {
         uint64_t objectId : 16;
         uint64_t customIndex : 9;
@@ -658,8 +658,8 @@ namespace T6
 
     union GfxDrawSurf
     {
-        gcc_align32(8) GfxDrawSurfFields fields;
+        gcc_align(8) GfxDrawSurfFields fields;
-        gcc_align32(8) uint64_t packed;
+        gcc_align(8) uint64_t packed;
     };
 
     // The sort key is translated to a numeric value inside the material templates
@@ -702,7 +702,7 @@ namespace T6
         MTL_GAMEFLAG_1000 = 0x1000,
     };
 
-    struct type_align32(8) MaterialInfo
+    struct type_align(8) MaterialInfo
     {
         const char* name;
         unsigned int gameFlags;
@@ -735,7 +735,7 @@ namespace T6
         CAMERA_REGION_NONE = CAMERA_REGION_COUNT,
     };
 
-    typedef tdef_align32(8) GfxStateBits GfxStateBitsTable;
+    typedef tdef_align(8) GfxStateBits GfxStateBitsTable;
 
     struct Material
     {
@@ -960,9 +960,9 @@ namespace T6
         unsigned int entryCount;
         unsigned int dependencyCount;
         unsigned int pad32;
-        gcc_align32(8) int64_t fileSize;
+        gcc_align(8) int64_t fileSize;
-        gcc_align32(8) int64_t entryOffset;
+        gcc_align(8) int64_t entryOffset;
-        gcc_align32(8) int64_t checksumOffset;
+        gcc_align(8) int64_t checksumOffset;
         char checksumChecksum[16];
         char dependencies[512];
         char padding[1464];
@@ -970,7 +970,7 @@ namespace T6
 
 #pragma pack(push, 1)
 
-    struct type_align32(2) SndRuntimeAssetBank
+    struct type_align(2) SndRuntimeAssetBank
     {
         const char* zone;
         const char* language;
@@ -985,7 +985,7 @@ namespace T6
 
 #pragma pack(pop)
 
-    typedef tdef_align32(2048) char SndChar2048;
+    typedef tdef_align(2048) char SndChar2048;
 
     struct SndLoadedAssets
     {
@@ -1041,8 +1041,8 @@ namespace T6
     };
 
     typedef unsigned short LeafBrush;
-    typedef tdef_align32(128) cbrush_t cbrush_array_t;
+    typedef tdef_align(128) cbrush_t cbrush_array_t;
-    typedef tdef_align32(128) Bounds BoundsArray;
+    typedef tdef_align(128) Bounds BoundsArray;
 
     struct ClipInfo
     {
@@ -1066,7 +1066,7 @@ namespace T6
         int* brushContents;
     };
 
-    struct type_align32(4) cLeaf_s
+    struct type_align(4) cLeaf_s
     {
         uint16_t firstCollAabbIndex;
         uint16_t collAabbCount;
@@ -1273,8 +1273,8 @@ namespace T6
         void /*ID3D11Buffer*/* indexBuffer;
     };
 
-    typedef tdef_align32(4) char aligned_byte_pointer;
+    typedef tdef_align(4) char aligned_byte_pointer;
-    typedef tdef_align32(4) GfxCompressedLightGridCoeffs GfxCompressedLightGridCoeffs_align4;
+    typedef tdef_align(4) GfxCompressedLightGridCoeffs GfxCompressedLightGridCoeffs_align4;
 
     struct GfxLightGrid
     {
@@ -1323,7 +1323,7 @@ namespace T6
         vec3_t sunFxPosition;
     };
 
-    typedef tdef_align32(4) GfxDrawSurf GfxDrawSurf_align4;
+    typedef tdef_align(4) GfxDrawSurf GfxDrawSurf_align4;
 
     struct GfxWorldDpvsStatic
     {
@@ -1449,7 +1449,7 @@ namespace T6
         int lightingQuality;
     };
 
-    struct type_align32(4) GfxLightImage
+    struct type_align(4) GfxLightImage
     {
         GfxImage* image;
         char samplerState;
@@ -1478,8 +1478,8 @@ namespace T6
     struct FontIcon
     {
         const char* name;
-        unsigned int numEntries;
+        int numEntries;
-        unsigned int numAliasEntries;
+        int numAliasEntries;
         FontIconEntry* fontIconEntry;
         FontIconAlias* fontIconAlias;
     };
@@ -1535,7 +1535,7 @@ namespace T6
         expressionRpn* rpn;
     };
 
-    struct type_align32(8) menuDef_t
+    struct type_align(8) menuDef_t
     {
         windowDef_t window;
         const char* font;
@@ -1562,8 +1562,8 @@ namespace T6
         GenericEventHandler* onEvent;
         ItemKeyHandler* onKey;
         ExpressionStatement visibleExp;
-        gcc_align32(8) uint64_t showBits;
+        gcc_align(8) uint64_t showBits;
-        gcc_align32(8) uint64_t hideBits;
+        gcc_align(8) uint64_t hideBits;
         const char* allowedBinding;
         const char* soundName;
         int imageTrack;
@@ -1942,7 +1942,7 @@ namespace T6
         int columnCount;
         int rowCount;
         StringTableCell* values;
-        uint16_t* cellIndex;
+        int16_t* cellIndex;
     };
 
     enum LbUpdateType
@@ -2753,9 +2753,9 @@ namespace T6
         uint16_t i[3];
     };
 
-    typedef tdef_align32(16) XSurfaceTri XSurfaceTri16;
+    typedef tdef_align(16) XSurfaceTri XSurfaceTri16;
 
-    struct type_align32(16) XSurface
+    struct type_align(16) XSurface
     {
         char tileMode;
         unsigned char vertListCount;
@@ -2783,7 +2783,7 @@ namespace T6
         int surfFlags;
     };
 
-    struct type_align32(4) XBoneInfo
+    struct type_align(4) XBoneInfo
     {
         vec3_t bounds[2];
         vec3_t offset;
@@ -3058,7 +3058,7 @@ namespace T6
     {
     };*/
 
-    struct type_align32(4) GfxImageLoadDef
+    struct type_align(4) GfxImageLoadDef
     {
         char levelCount;
         char flags;
@@ -3104,7 +3104,7 @@ namespace T6
         float returnHighpass;
     };
 
-    typedef tdef_align32(16) float SndFloatAlign16;
+    typedef tdef_align(16) float SndFloatAlign16;
 
     struct SndDuck
     {
@@ -3206,7 +3206,7 @@ namespace T6
         cLeafBrushNodeData_t data;
     };
 
-    struct type_align32(16) cbrush_t
+    struct type_align(16) cbrush_t
     {
         vec3_t mins;
         int contents;
@@ -3352,7 +3352,7 @@ namespace T6
         ROPE_CENTITY_CONSTRAINT = 0x3,
     };
 
-    struct type_align32(4) constraint_t
+    struct type_align(4) constraint_t
     {
         vec3_t p;
         rope_constraint_e type;
@@ -3374,7 +3374,7 @@ namespace T6
         unsigned int frame_index;
     };
 
-    struct type_align32(4) rope_t
+    struct type_align(4) rope_t
     {
         par_t m_particles[25];
         constraint_t m_constraints[30];
@@ -3489,7 +3489,7 @@ namespace T6
         uint16_t infoIndex;
     };
 
-    struct type_align32(4) pathnode_dynamic_t
+    struct type_align(4) pathnode_dynamic_t
     {
         SentientHandle pOwner;
         int iFreeTime;
@@ -3595,7 +3595,7 @@ namespace T6
         };
     };
 
-    struct type_align32(16) GfxLight
+    struct type_align(16) GfxLight
     {
         char type;
         char canUseShadowMap;
@@ -3814,8 +3814,7 @@ namespace T6
         uint16_t dynEntId;
     };
 
-    // Usually __m128, but that is not portable
+    union gcc_align(8) __m128
-    union gcc_align32(8) custom_m128
     {
         float m128_f32[4];
         uint64_t m128_u64[2];
@@ -3828,15 +3827,22 @@ namespace T6
         unsigned int m128_u32[4];
     };
 
-    struct vector4
+    struct vector3
     {
-        custom_m128 x;
+        __m128 x;
-        custom_m128 y;
+        __m128 y;
-        custom_m128 z;
+        __m128 z;
-        custom_m128 w;
     };
 
-    struct type_align32(16) SSkinInstance
+    struct vector4
+    {
+        __m128 x;
+        __m128 y;
+        __m128 z;
+        __m128 w;
+    };
+
+    struct type_align(16) SSkinInstance
     {
         union
         {
@@ -3888,7 +3894,7 @@ namespace T6
         int baseIndex;
     };
 
-    struct type_align32(16) GfxSurface
+    struct type_align(16) GfxSurface
     {
         srfTriangles_t tris;
         Material* material;
@@ -3913,7 +3919,7 @@ namespace T6
         uint16_t V2[4];
     };
 
-    struct type_align32(4) GfxStaticModelLmapVertexInfo
+    struct type_align(4) GfxStaticModelLmapVertexInfo
     {
         unsigned int* lmapVertexColors;
         void /*ID3D11Buffer*/* lmapVertexColorsVB;
@@ -4113,7 +4119,7 @@ namespace T6
         void* data;
     };
 
-    struct type_align32(8) itemDef_s
+    struct type_align(8) itemDef_s
     {
         windowDef_t window;
         int type;
@@ -5587,7 +5593,7 @@ namespace T6
         LOCAL_CLIENT_COUNT = 0x1,
     };
 
-    struct type_align32(4) DevGraph
+    struct type_align(4) DevGraph
     {
         vec2_t* knots;
         int* knotCount;
@@ -5609,7 +5615,7 @@ namespace T6
     };
 
     typedef char ByteVec[3];
-    typedef tdef_align32(4) uint16_t UShortVec[3];
+    typedef tdef_align(4) uint16_t UShortVec[3];
 
     union XAnimDynamicFrames
     {
@@ -5623,7 +5629,7 @@ namespace T6
         uint16_t _2[1];
     };
 
-    struct type_align32(4) XAnimPartTransFrames
+    struct type_align(4) XAnimPartTransFrames
     {
         vec3_t mins;
         vec3_t size;
@@ -5650,9 +5656,9 @@ namespace T6
         uint16_t _2[1];
     };
 
-    typedef tdef_align32(4) int16_t XQuat2[2];
+    typedef tdef_align(4) int16_t XQuat2[2];
 
-    struct type_align32(4) XAnimDeltaPartQuatDataFrames2
+    struct type_align(4) XAnimDeltaPartQuatDataFrames2
     {
         XQuat2* frames;
         XAnimDynamicIndicesDeltaQuat2 indices;
@@ -5676,9 +5682,9 @@ namespace T6
         uint16_t _2[1];
     };
 
-    typedef tdef_align32(4) int16_t XQuat[4];
+    typedef tdef_align(4) int16_t XQuat[4];
 
-    struct type_align32(4) XAnimDeltaPartQuatDataFrames
+    struct type_align(4) XAnimDeltaPartQuatDataFrames
     {
         XQuat* frames;
         XAnimDynamicIndicesDeltaQuat indices;
@@ -5738,7 +5744,7 @@ namespace T6
         vec4_t tvec;
     };
 
-    typedef tdef_align32(16) PhysGeomInfo PhysGeomInfo16;
+    typedef tdef_align(16) PhysGeomInfo PhysGeomInfo16;
 
     struct PhysGeomList
     {
@@ -6295,7 +6301,7 @@ namespace T6
     static_assert(sizeof(SndAliasFlags) == 8);
 #endif
 
-    struct type_align32(4) pathlink_s
+    struct type_align(4) pathlink_s
     {
         float fDist;
         uint16_t nodeNum;
@@ -6404,7 +6410,7 @@ namespace T6
         unsigned int v;
     };
 
-    struct type_align32(4) SSkinVert
+    struct type_align(4) SSkinVert
     {
         half4 pos_bone;
         PackedUnitVec normal;
@@ -6495,7 +6501,7 @@ namespace T6
         } vector;
     };
 
-    struct type_align32(8) dvar_t
+    struct type_align(8) dvar_t
     {
         const char* name;
         const char* description;
@@ -7006,7 +7012,7 @@ namespace T6
         uint16_t triangleBeginIndex;
     };
 
-    struct type_align32(16) BrushWrapper
+    struct type_align(16) BrushWrapper
     {
         vec3_t mins;
         int contents;

src/Common/Utils/TypeAlignment.h

@@ -7,6 +7,9 @@
 #ifdef tdef_align
 #undef tdef_align
 #endif
+#ifdef memb_align
+#undef memb_align
+#endif
 #ifdef gcc_align
 #undef gcc_align
 #endif
@@ -14,44 +17,25 @@
 #ifdef __zonecodegenerator
 #define type_align(x) alignas(x)
 #define tdef_align(x) alignas(x)
+#define memb_align(x) alignas(x)
 #define gcc_align(x)
 #else
 #ifdef __ida
 #define type_align(x) __declspec(align(x))
 #define tdef_align(x) __declspec(align(x))
+#define memb_align(x) __declspec(align(x))
 #define gcc_align(x)
 #else
 #ifdef _MSVC_LANG
 #define type_align(x) __declspec(align(x))
 #define tdef_align(x) __declspec(align(x))
+#define memb_align(x) __declspec(align(x))
 #define gcc_align(x)
 #else
 #define type_align(x) __attribute__((__aligned__(x)))
 #define tdef_align(x)
+#define memb_align(x) __attribute__((__aligned__(x)))
 #define gcc_align(x) __attribute__((__aligned__(x)))
 #endif
 #endif
 #endif
-
-#if defined(__zonecodegenerator) || defined(__ida)
-#define type_align32(x) type_align(x)
-#define tdef_align32(x) tdef_align(x)
-#define gcc_align32(x) gcc_align(x)
-#define type_align64(x) type_align(x)
-#define tdef_align64(x) tdef_align(x)
-#define gcc_align64(x) gcc_align(x)
-#elif defined(ARCH_x86)
-#define type_align32(x) type_align(x)
-#define tdef_align32(x) tdef_align(x)
-#define gcc_align32(x) gcc_align(x)
-#define type_align64(x)
-#define tdef_align64(x)
-#define gcc_align64(x)
-#elif defined(ARCH_x64)
-#define type_align32(x)
-#define tdef_align32(x)
-#define gcc_align32(x)
-#define type_align64(x) type_align(x)
-#define tdef_align64(x) tdef_align(x)
-#define gcc_align64(x) gcc_align(x)
-#endif

src/Common/Zone/ZoneTypes.h

@@ -1,6 +1,5 @@
 #pragma once
 #include <cstdint>
-#include <limits>
 
 struct ZoneHeader
 {
@@ -8,12 +7,22 @@ struct ZoneHeader
     uint32_t m_version;
 };
 
+#ifdef ARCH_x64
+typedef uint32_t scr_string_t;
+typedef uint64_t xchunk_size_t;
+typedef uint64_t xblock_size_t;
+typedef uint64_t zone_pointer_t;
+
+constexpr uint16_t SCR_STRING_MAX = UINT32_MAX;
+#elif ARCH_x86
 typedef uint16_t scr_string_t;
 typedef uint32_t xchunk_size_t;
 typedef uint32_t xblock_size_t;
+typedef uint32_t zone_pointer_t;
 
-constexpr uint16_t SCR_STRING_MAX = std::numeric_limits<scr_string_t>::max();
+constexpr uint16_t SCR_STRING_MAX = UINT16_MAX;
+#endif
 
-typedef unsigned block_t;
+typedef int block_t;
-typedef unsigned asset_type_t;
+typedef int asset_type_t;
 typedef unsigned int zone_priority_t;

src/Crypto.lua

@@ -1,29 +1,29 @@
-Cryptography = {}
+Crypto = {}
 
-function Cryptography:include(includes)
+function Crypto:include(includes)
 	if includes:handle(self:name()) then
 		includedirs {
-			path.join(ProjectFolder(), "Cryptography")
+			path.join(ProjectFolder(), "Crypto")
 		}
 	end
 end
 
-function Cryptography:link(links)
+function Crypto:link(links)
 	links:add(self:name())
 	links:linkto(libtomcrypt)
 	links:linkto(libtommath)
 	links:linkto(salsa20)
 end
 
-function Cryptography:use()
+function Crypto:use()
 	
 end
 
-function Cryptography:name()
+function Crypto:name()
-	return "Cryptography"
+	return "Crypto"
 end
 
-function Cryptography:project()
+function Crypto:project()
 	local folder = ProjectFolder()
 	local includes = Includes:create()
 
@@ -34,8 +34,8 @@ function Cryptography:project()
 		language "C++"
 		
 		files {
-			path.join(folder, "Cryptography/**.h"), 
+			path.join(folder, "Crypto/**.h"), 
-			path.join(folder, "Cryptography/**.cpp") 
+			path.join(folder, "Crypto/**.cpp") 
 		}
 		
 		self:include(includes)

src/Crypto/Crypto.cpp

@@ -0,0 +1,32 @@
+#include "Crypto.h"
+
+#include "Impl/AlgorithmMD5.h"
+#include "Impl/AlgorithmRSA.h"
+#include "Impl/AlgorithmSHA1.h"
+#include "Impl/AlgorithmSHA256.h"
+#include "Impl/AlgorithmSalsa20.h"
+
+std::unique_ptr<IHashFunction> Crypto::CreateMD5()
+{
+    return std::make_unique<AlgorithmMD5>();
+}
+
+std::unique_ptr<IHashFunction> Crypto::CreateSHA1()
+{
+    return std::make_unique<AlgorithmSHA1>();
+}
+
+std::unique_ptr<IHashFunction> Crypto::CreateSHA256()
+{
+    return std::make_unique<AlgorithmSHA256>();
+}
+
+std::unique_ptr<IStreamCipher> Crypto::CreateSalsa20(const uint8_t* keyBytes, const size_t keySize)
+{
+    return std::make_unique<AlgorithmSalsa20>(keyBytes, keySize);
+}
+
+std::unique_ptr<IPublicKeyAlgorithm> Crypto::CreateRSA(const IPublicKeyAlgorithm::HashingAlgorithm hashingAlgorithm, const RSAPaddingMode paddingMode)
+{
+    return std::make_unique<AlgorithmRSA>(hashingAlgorithm, paddingMode);
+}

src/Crypto/Crypto.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "IHashFunction.h"
+#include "IPublicKeyAlgorithm.h"
+#include "IStreamCipher.h"
+
+#include <cstddef>
+#include <memory>
+
+class Crypto
+{
+public:
+    enum class RSAPaddingMode
+    {
+        RSA_PADDING_PKS1,
+        RSA_PADDING_PSS,
+    };
+
+    static std::unique_ptr<IHashFunction> CreateMD5();
+
+    static std::unique_ptr<IHashFunction> CreateSHA1();
+    static std::unique_ptr<IHashFunction> CreateSHA256();
+
+    static std::unique_ptr<IStreamCipher> CreateSalsa20(const uint8_t* keyBytes, size_t keySize);
+
+    static std::unique_ptr<IPublicKeyAlgorithm> CreateRSA(IPublicKeyAlgorithm::HashingAlgorithm hashingAlgorithm, RSAPaddingMode paddingMode);
+};

src/Crypto/IHashFunction.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <cstddef>
+
+class IHashFunction
+{
+public:
+    virtual ~IHashFunction() = default;
+
+    virtual size_t GetHashSize() = 0;
+    virtual void Init() = 0;
+    virtual void Process(const void* input, size_t inputSize) = 0;
+    virtual void Finish(void* hashBuffer) = 0;
+};

src/Crypto/IPublicKeyAlgorithm.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+class IPublicKeyAlgorithm
+{
+public:
+    enum class HashingAlgorithm
+    {
+        RSA_HASH_SHA256,
+        RSA_HASH_SHA512
+    };
+
+    virtual ~IPublicKeyAlgorithm() = default;
+
+    virtual bool SetKey(const uint8_t* keyData, size_t keySize) = 0;
+
+    // If needed add a signing method
+
+    virtual bool Verify(const uint8_t* signedData, size_t signedDataSize, const uint8_t* signature, size_t signatureSize) = 0;
+};

src/Crypto/IStreamCipher.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+class IStreamCipher
+{
+public:
+    virtual ~IStreamCipher() = default;
+
+    virtual void SetIV(const uint8_t* iv, size_t ivSize) = 0;
+
+    virtual void Process(const void* plainText, void* cipherText, size_t amount) = 0;
+};

src/Crypto/Impl/AlgorithmMD5.cpp

@@ -0,0 +1,64 @@
+#include "AlgorithmMD5.h"
+
+#include "CryptoLibrary.h"
+
+#include <cstdint>
+
+class AlgorithmMD5::AlgorithmMD5Impl
+{
+    hash_state m_state{};
+
+public:
+    AlgorithmMD5Impl()
+    {
+        CryptoLibrary::Init();
+
+        Init();
+    }
+
+    void Init()
+    {
+        md5_init(&m_state);
+    }
+
+    void Process(const void* input, const size_t inputSize)
+    {
+        md5_process(&m_state, static_cast<const uint8_t*>(input), inputSize);
+    }
+
+    void Finish(void* hashBuffer)
+    {
+        md5_done(&m_state, static_cast<uint8_t*>(hashBuffer));
+    }
+};
+
+AlgorithmMD5::AlgorithmMD5()
+{
+    m_impl = new AlgorithmMD5Impl();
+}
+
+AlgorithmMD5::~AlgorithmMD5()
+{
+    delete m_impl;
+    m_impl = nullptr;
+}
+
+size_t AlgorithmMD5::GetHashSize()
+{
+    return HASH_SIZE;
+}
+
+void AlgorithmMD5::Init()
+{
+    m_impl->Init();
+}
+
+void AlgorithmMD5::Process(const void* input, const size_t inputSize)
+{
+    m_impl->Process(input, inputSize);
+}
+
+void AlgorithmMD5::Finish(void* hashBuffer)
+{
+    m_impl->Finish(hashBuffer);
+}

src/Crypto/Impl/AlgorithmMD5.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "IHashFunction.h"
+
+class AlgorithmMD5 : public IHashFunction
+{
+    class AlgorithmMD5Impl;
+    AlgorithmMD5Impl* m_impl;
+
+public:
+    static const int HASH_SIZE = 16;
+
+    AlgorithmMD5();
+    ~AlgorithmMD5() override;
+
+    size_t GetHashSize() override;
+
+    void Init() override;
+    void Process(const void* input, size_t inputSize) override;
+    void Finish(void* hashBuffer) override;
+};

src/Crypto/Impl/AlgorithmRSA.cpp

@@ -0,0 +1,119 @@
+#include "AlgorithmRSA.h"
+
+#include "CryptoLibrary.h"
+
+#include <cstring>
+
+class AlgorithmRSA::AlgorithmRSAImpl
+{
+    rsa_key m_key{};
+    HashingAlgorithm m_hash;
+    Crypto::RSAPaddingMode m_padding;
+
+    const ltc_hash_descriptor* GetHashDescriptor() const
+    {
+        switch (m_hash)
+        {
+        case HashingAlgorithm::RSA_HASH_SHA256:
+            return &sha256_desc;
+
+        default:
+        case HashingAlgorithm::RSA_HASH_SHA512:
+            return &sha512_desc;
+        }
+    }
+
+    int GetPaddingMode() const
+    {
+        switch (m_padding)
+        {
+        case Crypto::RSAPaddingMode::RSA_PADDING_PKS1:
+            return LTC_PKCS_1_V1_5;
+
+        default:
+        case Crypto::RSAPaddingMode::RSA_PADDING_PSS:
+            return LTC_PKCS_1_PSS;
+        }
+    }
+
+public:
+    AlgorithmRSAImpl(const HashingAlgorithm hash, const Crypto::RSAPaddingMode padding)
+    {
+        m_hash = hash;
+        m_padding = padding;
+
+        CryptoLibrary::Init();
+    }
+
+    ~AlgorithmRSAImpl() = default;
+
+    AlgorithmRSAImpl(AlgorithmRSAImpl& other) = default;
+    AlgorithmRSAImpl(AlgorithmRSAImpl&& other) = delete;
+
+    AlgorithmRSAImpl& operator=(AlgorithmRSAImpl const& other) = default;
+    AlgorithmRSAImpl& operator=(AlgorithmRSAImpl&& other) = delete;
+
+    bool SetKey(const uint8_t* keyData, const size_t keySize)
+    {
+        return rsa_import(keyData, keySize, &m_key) == CRYPT_OK;
+    }
+
+    bool Verify(const uint8_t* signedData, const size_t signedDataSize, const uint8_t* signature, const size_t signatureSize)
+    {
+        const ltc_hash_descriptor* hashDesc = GetHashDescriptor();
+        const int hashId = register_hash(hashDesc);
+        const int padding = GetPaddingMode();
+
+        int result;
+        rsa_verify_hash_ex(signature, signatureSize, signedData, signedDataSize, padding, hashId, 8, &result, &m_key);
+
+        return result == 1;
+    }
+};
+
+AlgorithmRSA::AlgorithmRSA(const HashingAlgorithm hash, const Crypto::RSAPaddingMode padding)
+{
+    m_impl = new AlgorithmRSAImpl(hash, padding);
+}
+
+AlgorithmRSA::~AlgorithmRSA()
+{
+    delete m_impl;
+    m_impl = nullptr;
+}
+
+AlgorithmRSA::AlgorithmRSA(AlgorithmRSA& other)
+{
+    m_impl = new AlgorithmRSAImpl(*other.m_impl);
+}
+
+AlgorithmRSA::AlgorithmRSA(AlgorithmRSA&& other) noexcept
+{
+    m_impl = other.m_impl;
+    other.m_impl = nullptr;
+}
+
+AlgorithmRSA& AlgorithmRSA::operator=(AlgorithmRSA const& other)
+{
+    m_impl = new AlgorithmRSAImpl(*other.m_impl);
+
+    return *this;
+}
+
+AlgorithmRSA& AlgorithmRSA::operator=(AlgorithmRSA&& other) noexcept
+{
+    m_impl = other.m_impl;
+    other.m_impl = nullptr;
+
+    return *this;
+}
+
+bool AlgorithmRSA::SetKey(const uint8_t* keyData, size_t keySize)
+{
+    return m_impl->SetKey(keyData, keySize);
+}
+
+bool AlgorithmRSA::Verify(const uint8_t* signedData, const size_t signedDataSize, const uint8_t* signature, const size_t signatureSize)
+{
+    return m_impl->Verify(signedData, signedDataSize, signature, signatureSize);
+}

src/Crypto/Impl/AlgorithmRSA.h

@@ -0,0 +1,25 @@
+#pragma once
+#include "Crypto.h"
+#include "IPublicKeyAlgorithm.h"
+
+#include <cstdint>
+
+class AlgorithmRSA final : public IPublicKeyAlgorithm
+{
+    class AlgorithmRSAImpl;
+    AlgorithmRSAImpl* m_impl;
+
+public:
+    AlgorithmRSA(HashingAlgorithm hash, Crypto::RSAPaddingMode padding);
+    ~AlgorithmRSA() override;
+
+    AlgorithmRSA(AlgorithmRSA& other);
+    AlgorithmRSA(AlgorithmRSA&& other) noexcept;
+
+    AlgorithmRSA& operator=(AlgorithmRSA const& other);
+    AlgorithmRSA& operator=(AlgorithmRSA&& other) noexcept;
+
+    bool SetKey(const uint8_t* keyData, size_t keySize) override;
+
+    bool Verify(const uint8_t* signedData, size_t signedDataSize, const uint8_t* signature, size_t signatureSize) override;
+};

src/Crypto/Impl/AlgorithmSHA1.cpp

@@ -0,0 +1,64 @@
+#include "AlgorithmSHA1.h"
+
+#include "CryptoLibrary.h"
+
+#include <cstdint>
+
+class AlgorithmSHA1::AlgorithmSHA1Impl
+{
+    hash_state m_state{};
+
+public:
+    AlgorithmSHA1Impl()
+    {
+        CryptoLibrary::Init();
+
+        Init();
+    }
+
+    void Init()
+    {
+        sha1_init(&m_state);
+    }
+
+    void Process(const void* input, const size_t inputSize)
+    {
+        sha1_process(&m_state, static_cast<const uint8_t*>(input), inputSize);
+    }
+
+    void Finish(void* hashBuffer)
+    {
+        sha1_done(&m_state, static_cast<uint8_t*>(hashBuffer));
+    }
+};
+
+AlgorithmSHA1::AlgorithmSHA1()
+{
+    m_impl = new AlgorithmSHA1Impl();
+}
+
+AlgorithmSHA1::~AlgorithmSHA1()
+{
+    delete m_impl;
+    m_impl = nullptr;
+}
+
+size_t AlgorithmSHA1::GetHashSize()
+{
+    return HASH_SIZE;
+}
+
+void AlgorithmSHA1::Init()
+{
+    m_impl->Init();
+}
+
+void AlgorithmSHA1::Process(const void* input, const size_t inputSize)
+{
+    m_impl->Process(input, inputSize);
+}
+
+void AlgorithmSHA1::Finish(void* hashBuffer)
+{
+    m_impl->Finish(hashBuffer);
+}

src/Crypto/Impl/AlgorithmSHA1.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "IHashFunction.h"
+
+class AlgorithmSHA1 : public IHashFunction
+{
+    class AlgorithmSHA1Impl;
+    AlgorithmSHA1Impl* m_impl;
+
+public:
+    static const int HASH_SIZE = 20;
+
+    AlgorithmSHA1();
+    ~AlgorithmSHA1() override;
+
+    size_t GetHashSize() override;
+
+    void Init() override;
+    void Process(const void* input, size_t inputSize) override;
+    void Finish(void* hashBuffer) override;
+};

src/Crypto/Impl/AlgorithmSHA256.cpp

@@ -0,0 +1,64 @@
+#include "AlgorithmSHA256.h"
+
+#include "CryptoLibrary.h"
+
+#include <cstdint>
+
+class AlgorithmSHA256::Impl
+{
+    hash_state m_state{};
+
+public:
+    Impl()
+    {
+        CryptoLibrary::Init();
+
+        Init();
+    }
+
+    void Init()
+    {
+        sha256_init(&m_state);
+    }
+
+    void Process(const void* input, const size_t inputSize)
+    {
+        sha256_process(&m_state, static_cast<const uint8_t*>(input), inputSize);
+    }
+
+    void Finish(void* hashBuffer)
+    {
+        sha256_done(&m_state, static_cast<uint8_t*>(hashBuffer));
+    }
+};
+
+AlgorithmSHA256::AlgorithmSHA256()
+{
+    m_impl = new Impl();
+}
+
+AlgorithmSHA256::~AlgorithmSHA256()
+{
+    delete m_impl;
+    m_impl = nullptr;
+}
+
+size_t AlgorithmSHA256::GetHashSize()
+{
+    return HASH_SIZE;
+}
+
+void AlgorithmSHA256::Init()
+{
+    m_impl->Init();
+}
+
+void AlgorithmSHA256::Process(const void* input, const size_t inputSize)
+{
+    m_impl->Process(input, inputSize);
+}
+
+void AlgorithmSHA256::Finish(void* hashBuffer)
+{
+    m_impl->Finish(hashBuffer);
+}

src/Crypto/Impl/AlgorithmSHA256.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "IHashFunction.h"
+
+class AlgorithmSHA256 : public IHashFunction
+{
+    class Impl;
+    Impl* m_impl;
+
+public:
+    static const int HASH_SIZE = 32;
+
+    AlgorithmSHA256();
+    ~AlgorithmSHA256() override;
+
+    size_t GetHashSize() override;
+
+    void Init() override;
+    void Process(const void* input, size_t inputSize) override;
+    void Finish(void* hashBuffer) override;
+};

src/Crypto/Impl/AlgorithmSalsa20.cpp

@@ -0,0 +1,89 @@
+#include "AlgorithmSalsa20.h"
+
+#include "salsa20.h"
+
+#include <cassert>
+#include <stdexcept>
+
+class AlgorithmSalsa20::AlgorithmSalsa20Impl
+{
+    salsa20_ctx m_context{};
+
+public:
+    AlgorithmSalsa20Impl(const uint8_t* keyBytes, const size_t keySize)
+    {
+        Salsa20_KeySetup(&m_context, keyBytes, keySize * 8);
+    }
+
+    ~AlgorithmSalsa20Impl() = default;
+
+    AlgorithmSalsa20Impl(AlgorithmSalsa20Impl& other) = default;
+    AlgorithmSalsa20Impl(AlgorithmSalsa20Impl&& other) = delete;
+
+    AlgorithmSalsa20Impl& operator=(AlgorithmSalsa20Impl const& other) = default;
+    AlgorithmSalsa20Impl& operator=(AlgorithmSalsa20Impl&& other) = delete;
+
+    void SetIV(const uint8_t* iv, const size_t ivSize)
+    {
+        assert(ivSize == 8);
+
+        if (ivSize != 8)
+        {
+            throw std::invalid_argument("Salsa20 IV size must be 8");
+        }
+
+        Salsa20_IVSetup(&m_context, iv);
+    }
+
+    void Process(const void* plainText, void* cipherText, const size_t amount)
+    {
+        Salsa20_Encrypt_Bytes(&m_context, static_cast<const uint8_t*>(plainText), static_cast<uint8_t*>(cipherText), amount);
+    }
+};
+
+AlgorithmSalsa20::AlgorithmSalsa20(const uint8_t* keyBytes, const size_t keySize)
+{
+    m_impl = new AlgorithmSalsa20Impl(keyBytes, keySize);
+}
+
+AlgorithmSalsa20::~AlgorithmSalsa20()
+{
+    delete m_impl;
+    m_impl = nullptr;
+}
+
+AlgorithmSalsa20::AlgorithmSalsa20(AlgorithmSalsa20& other)
+{
+    m_impl = new AlgorithmSalsa20Impl(*other.m_impl);
+}
+
+AlgorithmSalsa20::AlgorithmSalsa20(AlgorithmSalsa20&& other) noexcept
+{
+    m_impl = other.m_impl;
+    other.m_impl = nullptr;
+}
+
+AlgorithmSalsa20& AlgorithmSalsa20::operator=(AlgorithmSalsa20 const& other)
+{
+    m_impl = new AlgorithmSalsa20Impl(*other.m_impl);
+
+    return *this;
+}
+
+AlgorithmSalsa20& AlgorithmSalsa20::operator=(AlgorithmSalsa20&& other) noexcept
+{
+    m_impl = other.m_impl;
+    other.m_impl = nullptr;
+
+    return *this;
+}
+
+void AlgorithmSalsa20::SetIV(const uint8_t* iv, const size_t ivSize)
+{
+    m_impl->SetIV(iv, ivSize);
+}
+
+void AlgorithmSalsa20::Process(const void* plainText, void* cipherText, const size_t amount)
+{
+    m_impl->Process(plainText, cipherText, amount);
+}

src/Crypto/Impl/AlgorithmSalsa20.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "IStreamCipher.h"
+
+class AlgorithmSalsa20 final : public IStreamCipher
+{
+    class AlgorithmSalsa20Impl;
+    AlgorithmSalsa20Impl* m_impl;
+
+public:
+    AlgorithmSalsa20(const uint8_t* keyBytes, size_t keySize);
+    ~AlgorithmSalsa20() override;
+
+    AlgorithmSalsa20(AlgorithmSalsa20& other);
+    AlgorithmSalsa20(AlgorithmSalsa20&& other) noexcept;
+
+    AlgorithmSalsa20& operator=(AlgorithmSalsa20 const& other);
+    AlgorithmSalsa20& operator=(AlgorithmSalsa20&& other) noexcept;
+
+    void SetIV(const uint8_t* iv, size_t ivSize) override;
+    void Process(const void* plainText, void* cipherText, size_t amount) override;
+};

src/Crypto/Impl/Base64.cpp

@@ -0,0 +1,49 @@
+#include "Base64.h"
+
+#define LTC_NO_PROTOTYPES
+#include <tomcrypt.h>
+
+namespace base64
+{
+    std::string EncodeBase64(const void* inputData, const size_t inputLength)
+    {
+        const auto base64BufferSize = GetBase64EncodeOutputLength(inputLength);
+
+        std::string output(base64BufferSize, '\0');
+        const auto outLength = base64BufferSize + 1u;
+
+        const auto result = EncodeBase64(inputData, inputLength, output.data(), outLength);
+        assert(result);
+
+        return output;
+    }
+
+    bool EncodeBase64(const void* inputData, const size_t inputLength, void* outputBuffer, const size_t outputBufferSize)
+    {
+        unsigned long outLength = outputBufferSize;
+        const auto result = base64_encode(static_cast<const unsigned char*>(inputData), inputLength, static_cast<char*>(outputBuffer), &outLength);
+        return result == CRYPT_OK;
+    }
+
+    size_t GetBase64EncodeOutputLength(const size_t inputLength)
+    {
+        return 4u * ((inputLength + 2u) / 3u);
+    }
+
+    size_t DecodeBase64(const void* base64Data, const size_t inputLength, void* outputBuffer, const size_t outputBufferSize)
+    {
+        unsigned long outLength = GetBase64DecodeOutputLength(inputLength);
+        if (outLength > outputBufferSize)
+            return 0u;
+
+        const auto result = base64_decode(static_cast<const char*>(base64Data), inputLength, static_cast<unsigned char*>(outputBuffer), &outLength);
+        assert(result == CRYPT_OK);
+
+        return static_cast<size_t>(outLength);
+    }
+
+    size_t GetBase64DecodeOutputLength(const size_t inputLength)
+    {
+        return inputLength / 4u;
+    }
+} // namespace base64

src/Crypto/Impl/Base64.h

@@ -8,6 +8,5 @@ namespace base64
     size_t GetBase64EncodeOutputLength(size_t inputLength);
 
     size_t DecodeBase64(const void* base64Data, size_t inputLength, void* outputBuffer, size_t outputBufferSize);
-    size_t GetBase64DecodeOutputLength(const void* base64Data, size_t inputLength);
     size_t GetBase64DecodeOutputLength(size_t inputLength);
 } // namespace base64

src/Crypto/Impl/CryptoLibrary.cpp

@@ -0,0 +1,15 @@
+#include "CryptoLibrary.h"
+
+#include "tommath.h"
+
+void CryptoLibrary::Init()
+{
+    static bool initialized = false;
+
+    if (!initialized)
+    {
+        initialized = true;
+
+        ltc_mp = ltm_desc;
+    }
+}

src/Crypto/Impl/CryptoLibrary.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#define LTC_NO_PROTOTYPES
+#include "tomcrypt.h"
+
+class CryptoLibrary
+{
+public:
+    static void Init();
+};

src/Cryptography/Algorithms/AlgorithmMd5.cpp

@@ -1,54 +0,0 @@
-#include "AlgorithmMd5.h"
-
-#include "Internal/CryptoLibrary.h"
-
-#include <cstdint>
-
-using namespace cryptography;
-
-namespace
-{
-    constexpr int HASH_SIZE = 16;
-
-    class AlgorithmMd5 final : public IHashFunction
-    {
-    public:
-        AlgorithmMd5()
-        {
-            internal::CryptoLibrary::Init();
-
-            Init();
-        }
-
-        size_t GetHashSize() override
-        {
-            return HASH_SIZE;
-        }
-
-        void Init() override
-        {
-            md5_init(&m_state);
-        }
-
-        void Process(const void* input, const size_t inputSize) override
-        {
-            md5_process(&m_state, static_cast<const uint8_t*>(input), static_cast<unsigned long>(inputSize));
-        }
-
-        void Finish(void* hashBuffer) override
-        {
-            md5_done(&m_state, static_cast<uint8_t*>(hashBuffer));
-        }
-
-    private:
-        hash_state m_state{};
-    };
-} // namespace
-
-namespace cryptography
-{
-    std::unique_ptr<IHashFunction> CreateMd5()
-    {
-        return std::make_unique<AlgorithmMd5>();
-    }
-} // namespace cryptography

src/Cryptography/Algorithms/AlgorithmMd5.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "IHashFunction.h"
-
-#include <memory>
-
-namespace cryptography
-{
-    std::unique_ptr<IHashFunction> CreateMd5();
-}

src/Cryptography/Algorithms/AlgorithmRsa.cpp

@@ -1,84 +0,0 @@
-#include "AlgorithmRsa.h"
-
-#include "Internal/CryptoLibrary.h"
-
-using namespace cryptography;
-
-namespace
-{
-    class AlgorithmRsa final : public IPublicKeyAlgorithm
-    {
-    public:
-        AlgorithmRsa(const HashingAlgorithm hash, const RsaPaddingMode padding)
-        {
-            m_hash = hash;
-            m_padding = padding;
-
-            internal::CryptoLibrary::Init();
-        }
-
-        bool SetKey(const uint8_t* keyData, const size_t keySize) override
-        {
-            return rsa_import(keyData, static_cast<unsigned long>(keySize), &m_key) == CRYPT_OK;
-        }
-
-        bool Verify(const uint8_t* signedData, const size_t signedDataSize, const uint8_t* signature, const size_t signatureSize) override
-        {
-            const ltc_hash_descriptor* hashDesc = GetHashDescriptor();
-            const int hashId = register_hash(hashDesc);
-            const int padding = GetPaddingMode();
-
-            int result;
-            rsa_verify_hash_ex(signature,
-                               static_cast<unsigned long>(signatureSize),
-                               signedData,
-                               static_cast<unsigned long>(signedDataSize),
-                               padding,
-                               hashId,
-                               8,
-                               &result,
-                               &m_key);
-
-            return result == 1;
-        }
-
-    private:
-        [[nodiscard]] const ltc_hash_descriptor* GetHashDescriptor() const
-        {
-            switch (m_hash)
-            {
-            case HashingAlgorithm::RSA_HASH_SHA256:
-                return &sha256_desc;
-
-            default:
-            case HashingAlgorithm::RSA_HASH_SHA512:
-                return &sha512_desc;
-            }
-        }
-
-        [[nodiscard]] int GetPaddingMode() const
-        {
-            switch (m_padding)
-            {
-            case RsaPaddingMode::RSA_PADDING_PKS1:
-                return LTC_PKCS_1_V1_5;
-
-            default:
-            case RsaPaddingMode::RSA_PADDING_PSS:
-                return LTC_PKCS_1_PSS;
-            }
-        }
-
-        rsa_key m_key{};
-        HashingAlgorithm m_hash;
-        RsaPaddingMode m_padding;
-    };
-} // namespace
-
-namespace cryptography
-{
-    std::unique_ptr<IPublicKeyAlgorithm> CreateRsa(const HashingAlgorithm hashingAlgorithm, const RsaPaddingMode paddingMode)
-    {
-        return std::make_unique<AlgorithmRsa>(hashingAlgorithm, paddingMode);
-    }
-} // namespace cryptography

src/Cryptography/Algorithms/AlgorithmRsa.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include "IPublicKeyAlgorithm.h"
-
-#include <cstdint>
-#include <memory>
-
-namespace cryptography
-{
-    enum class RsaPaddingMode : std::uint8_t
-    {
-        RSA_PADDING_PKS1,
-        RSA_PADDING_PSS,
-    };
-
-    std::unique_ptr<IPublicKeyAlgorithm> CreateRsa(HashingAlgorithm hashingAlgorithm, RsaPaddingMode paddingMode);
-} // namespace cryptography

src/Cryptography/Algorithms/AlgorithmSalsa20.cpp

@@ -1,46 +0,0 @@
-#include "AlgorithmSalsa20.h"
-
-#include "salsa20.h"
-
-#include <cassert>
-#include <stdexcept>
-
-using namespace cryptography;
-
-namespace
-{
-    class AlgorithmSalsa20 final : public IStreamCipher
-    {
-    public:
-        AlgorithmSalsa20(const uint8_t* keyBytes, const size_t keySize)
-        {
-            Salsa20_KeySetup(&m_context, keyBytes, static_cast<uint32_t>(keySize * 8uz));
-        }
-
-        void SetIv(const uint8_t* iv, const size_t ivSize) override
-        {
-            assert(ivSize == 8);
-
-            if (ivSize != 8)
-                throw std::invalid_argument("Salsa20 IV size must be 8");
-
-            Salsa20_IVSetup(&m_context, iv);
-        }
-
-        void Process(const void* plainText, void* cipherText, const size_t amount) override
-        {
-            Salsa20_Encrypt_Bytes(&m_context, static_cast<const uint8_t*>(plainText), static_cast<uint8_t*>(cipherText), static_cast<uint32_t>(amount));
-        }
-
-    private:
-        salsa20_ctx m_context{};
-    };
-} // namespace
-
-namespace cryptography
-{
-    std::unique_ptr<IStreamCipher> CreateSalsa20(const uint8_t* keyBytes, const size_t keySize)
-    {
-        return std::make_unique<AlgorithmSalsa20>(keyBytes, keySize);
-    }
-} // namespace cryptography

src/Cryptography/Algorithms/AlgorithmSalsa20.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "IStreamCipher.h"
-
-#include <memory>
-
-namespace cryptography
-{
-    std::unique_ptr<IStreamCipher> CreateSalsa20(const uint8_t* keyBytes, size_t keySize);
-}

src/Cryptography/Algorithms/AlgorithmSha1.cpp

@@ -1,54 +0,0 @@
-#include "AlgorithmSha1.h"
-
-#include "Internal/CryptoLibrary.h"
-
-#include <cstdint>
-
-using namespace cryptography;
-
-namespace
-{
-    constexpr int HASH_SIZE = 20;
-
-    class AlgorithmSha1 final : public IHashFunction
-    {
-    public:
-        AlgorithmSha1()
-        {
-            internal::CryptoLibrary::Init();
-
-            Init();
-        }
-
-        size_t GetHashSize() override
-        {
-            return HASH_SIZE;
-        }
-
-        void Init() override
-        {
-            sha1_init(&m_state);
-        }
-
-        void Process(const void* input, const size_t inputSize) override
-        {
-            sha1_process(&m_state, static_cast<const uint8_t*>(input), static_cast<unsigned long>(inputSize));
-        }
-
-        void Finish(void* hashBuffer) override
-        {
-            sha1_done(&m_state, static_cast<uint8_t*>(hashBuffer));
-        }
-
-    private:
-        hash_state m_state{};
-    };
-} // namespace
-
-namespace cryptography
-{
-    std::unique_ptr<IHashFunction> CreateSha1()
-    {
-        return std::make_unique<AlgorithmSha1>();
-    }
-} // namespace cryptography

src/Cryptography/Algorithms/AlgorithmSha1.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "IHashFunction.h"
-
-#include <memory>
-
-namespace cryptography
-{
-    std::unique_ptr<IHashFunction> CreateSha1();
-}

src/Cryptography/Algorithms/AlgorithmSha256.cpp

@@ -1,54 +0,0 @@
-#include "AlgorithmSha256.h"
-
-#include "Internal/CryptoLibrary.h"
-
-#include <cstdint>
-
-using namespace cryptography;
-
-namespace
-{
-    constexpr int HASH_SIZE = 32;
-
-    class AlgorithmSha256 final : public IHashFunction
-    {
-    public:
-        AlgorithmSha256()
-        {
-            internal::CryptoLibrary::Init();
-
-            Init();
-        }
-
-        size_t GetHashSize() override
-        {
-            return HASH_SIZE;
-        }
-
-        void Init() override
-        {
-            sha256_init(&m_state);
-        }
-
-        void Process(const void* input, const size_t inputSize) override
-        {
-            sha256_process(&m_state, static_cast<const uint8_t*>(input), static_cast<unsigned long>(inputSize));
-        }
-
-        void Finish(void* hashBuffer) override
-        {
-            sha256_done(&m_state, static_cast<uint8_t*>(hashBuffer));
-        }
-
-    private:
-        hash_state m_state{};
-    };
-} // namespace
-
-namespace cryptography
-{
-    std::unique_ptr<IHashFunction> CreateSha256()
-    {
-        return std::make_unique<AlgorithmSha256>();
-    }
-} // namespace cryptography

src/Cryptography/Algorithms/AlgorithmSha256.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "IHashFunction.h"
-
-#include <memory>
-
-namespace cryptography
-{
-    std::unique_ptr<IHashFunction> CreateSha256();
-}

src/Cryptography/Base64.cpp

@@ -1,72 +0,0 @@
-#include "Base64.h"
-
-#define LTC_NO_PROTOTYPES
-#include <tomcrypt.h>
-
-namespace base64
-{
-    std::string EncodeBase64(const void* inputData, const size_t inputLength)
-    {
-        const auto base64BufferSize = GetBase64EncodeOutputLength(inputLength);
-
-        std::string output(base64BufferSize, '\0');
-        const auto outLength = base64BufferSize + 1u;
-
-        const auto result = EncodeBase64(inputData, inputLength, output.data(), outLength);
-        assert(result);
-
-        return output;
-    }
-
-    bool EncodeBase64(const void* inputData, const size_t inputLength, void* outputBuffer, const size_t outputBufferSize)
-    {
-        unsigned long outLength = static_cast<unsigned long>(outputBufferSize);
-        const auto result =
-            base64_encode(static_cast<const unsigned char*>(inputData), static_cast<unsigned long>(inputLength), static_cast<char*>(outputBuffer), &outLength);
-        return result == CRYPT_OK;
-    }
-
-    size_t GetBase64EncodeOutputLength(const size_t inputLength)
-    {
-        return 4u * ((inputLength + 2u) / 3u);
-    }
-
-    size_t DecodeBase64(const void* base64Data, const size_t inputLength, void* outputBuffer, const size_t outputBufferSize)
-    {
-        auto outLength = static_cast<unsigned long>(GetBase64DecodeOutputLength(base64Data, inputLength));
-        assert(outLength <= outputBufferSize);
-        if (outLength > outputBufferSize)
-            return 0u;
-
-        const auto result =
-            base64_decode(static_cast<const char*>(base64Data), static_cast<unsigned long>(inputLength), static_cast<unsigned char*>(outputBuffer), &outLength);
-        assert(result == CRYPT_OK);
-
-        return static_cast<size_t>(outLength);
-    }
-
-    size_t GetBase64DecodeOutputLength(const void* base64Data, const size_t inputLength)
-    {
-        assert(base64Data);
-        assert(inputLength);
-
-        if (!base64Data || inputLength == 0u)
-            return 0u;
-
-        auto padding = 0u;
-        if (inputLength >= 1 && static_cast<const char*>(base64Data)[inputLength - 1] == '=')
-        {
-            if (inputLength >= 2 && static_cast<const char*>(base64Data)[inputLength - 2] == '=')
-                padding = 2u;
-            else
-                padding = 1u;
-        }
-
-        return ((inputLength / 4u) * 3u) - padding;
-    }
-
-    size_t GetBase64DecodeOutputLength(const size_t inputLength)
-    {
-        return (inputLength / 4u) * 3u;
-    }
-} // namespace base64

src/Cryptography/Cryptography.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Algorithms/AlgorithmMd5.h"
-#include "Algorithms/AlgorithmRsa.h"
-#include "Algorithms/AlgorithmSalsa20.h"
-#include "Algorithms/AlgorithmSha1.h"
-#include "Algorithms/AlgorithmSha256.h"

src/Cryptography/IHashFunction.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <cstdlib>
-
-namespace cryptography
-{
-    class IHashFunction
-    {
-    public:
-        IHashFunction() = default;
-        virtual ~IHashFunction() = default;
-        IHashFunction(const IHashFunction& other) = default;
-        IHashFunction(IHashFunction&& other) noexcept = default;
-        IHashFunction& operator=(const IHashFunction& other) = default;
-        IHashFunction& operator=(IHashFunction&& other) noexcept = default;
-
-        virtual size_t GetHashSize() = 0;
-        virtual void Init() = 0;
-        virtual void Process(const void* input, size_t inputSize) = 0;
-        virtual void Finish(void* hashBuffer) = 0;
-    };
-} // namespace cryptography

src/Cryptography/IPublicKeyAlgorithm.h

@@ -1,30 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <cstdlib>
-
-namespace cryptography
-{
-    enum class HashingAlgorithm : std::uint8_t
-    {
-        RSA_HASH_SHA256,
-        RSA_HASH_SHA512
-    };
-
-    class IPublicKeyAlgorithm
-    {
-    public:
-        IPublicKeyAlgorithm() = default;
-        virtual ~IPublicKeyAlgorithm() = default;
-        IPublicKeyAlgorithm(const IPublicKeyAlgorithm& other) = default;
-        IPublicKeyAlgorithm(IPublicKeyAlgorithm&& other) noexcept = default;
-        IPublicKeyAlgorithm& operator=(const IPublicKeyAlgorithm& other) = default;
-        IPublicKeyAlgorithm& operator=(IPublicKeyAlgorithm&& other) noexcept = default;
-
-        virtual bool SetKey(const uint8_t* keyData, size_t keySize) = 0;
-
-        // If needed, add a signing method
-
-        virtual bool Verify(const uint8_t* signedData, size_t signedDataSize, const uint8_t* signature, size_t signatureSize) = 0;
-    };
-} // namespace cryptography

src/Cryptography/IStreamCipher.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <cstdlib>
-
-namespace cryptography
-{
-    class IStreamCipher
-    {
-    public:
-        IStreamCipher() = default;
-        virtual ~IStreamCipher() = default;
-        IStreamCipher(const IStreamCipher& other) = default;
-        IStreamCipher(IStreamCipher&& other) noexcept = default;
-        IStreamCipher& operator=(const IStreamCipher& other) = default;
-        IStreamCipher& operator=(IStreamCipher&& other) noexcept = default;
-
-        virtual void SetIv(const uint8_t* iv, size_t ivSize) = 0;
-        virtual void Process(const void* plainText, void* cipherText, size_t amount) = 0;
-    };
-} // namespace cryptography

src/Cryptography/Internal/CryptoLibrary.cpp

@@ -1,18 +0,0 @@
-#include "CryptoLibrary.h"
-
-#include "tommath.h"
-
-namespace cryptography::internal
-{
-    void CryptoLibrary::Init()
-    {
-        static bool initialized = false;
-
-        if (!initialized)
-        {
-            initialized = true;
-
-            ltc_mp = ltm_desc;
-        }
-    }
-} // namespace cryptography::internal

src/Cryptography/Internal/CryptoLibrary.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#define LTC_NO_PROTOTYPES
-#include "tomcrypt.h"
-
-namespace cryptography::internal
-{
-    class CryptoLibrary
-    {
-    public:
-        static void Init();
-    };
-} // namespace cryptography::internal

src/Linker/Linker.cpp

@@ -4,7 +4,6 @@
 #include "LinkerPaths.h"
 #include "ObjContainer/SoundBank/SoundBankWriter.h"
 #include "ObjWriting.h"
-#include "SearchPath/OutputPathFilesystem.h"
 #include "SearchPath/SearchPaths.h"
 #include "Utils/ObjFileStream.h"
 #include "Zone/AssetList/AssetList.h"
@@ -269,41 +268,42 @@ class LinkerImpl final : public Linker
         return zone_creator::CreateZoneForDefinition(zoneDefinition.m_game, context);
     }
 
-    static bool WriteZoneToFile(IOutputPath& outPath, const Zone& zone)
+    bool WriteZoneToFile(const LinkerPathManager& paths, const fs::path& outDir, const std::string& projectName, Zone* zone) const
     {
-        const auto stream = outPath.Open(std::format("{}.ff", zone.m_name));
+        auto zoneFilePath(outDir);
-        if (!stream)
+        zoneFilePath.append(std::format("{}.ff", zone->m_name));
-        {
+
-            std::cerr << std::format("Failed to open file for zone: {}\n", zone.m_name);
+        fs::create_directories(outDir);
+
+        std::ofstream stream(zoneFilePath, std::fstream::out | std::fstream::binary);
+        if (!stream.is_open())
             return false;
-        }
 
-        std::cout << std::format("Building zone \"{}\"\n", zone.m_name);
+        std::cout << std::format("Building zone \"{}\"\n", zoneFilePath.string());
 
-        if (!ZoneWriting::WriteZone(*stream, zone))
+        if (!ZoneWriting::WriteZone(stream, zone))
         {
             std::cerr << "Writing zone failed.\n";
+            stream.close();
             return false;
         }
 
-        std::cout << std::format("Created zone \"{}\"\n", zone.m_name);
+        std::cout << std::format("Created zone \"{}\"\n", zoneFilePath.string());
 
+        stream.close();
         return true;
     }
 
     bool BuildFastFile(LinkerPathManager& paths, const std::string& projectName, const std::string& targetName, ZoneDefinition& zoneDefinition) const
     {
         const fs::path outDir(paths.m_linker_paths->BuildOutputFolderPath(projectName, zoneDefinition.m_game));
-
-        OutputPathFilesystem outputPath(outDir);
-
         const fs::path cacheDir(paths.m_linker_paths->BuildCacheFolderPath(projectName, zoneDefinition.m_game));
         SoundBankWriter::OutputPath = outDir;
 
         const auto zone = CreateZoneForDefinition(paths, outDir, cacheDir, targetName, zoneDefinition);
         auto result = zone != nullptr;
         if (zone)
-            result = WriteZoneToFile(outputPath, *zone);
+            result = WriteZoneToFile(paths, outDir, projectName, zone.get());
 
         return result;
     }

src/Linker/LinkerArgs.cpp

@@ -5,7 +5,6 @@
 #include "ObjWriting.h"
 #include "Utils/Arguments/UsageInformation.h"
 #include "Utils/FileUtils.h"
-#include "Utils/PathUtils.h"
 
 #include <filesystem>
 #include <format>
@@ -153,9 +152,9 @@ void LinkerArgs::PrintVersion()
     std::cout << std::format("OpenAssetTools Linker {}\n", GIT_VERSION);
 }
 
-void LinkerArgs::SetBinFolder()
+void LinkerArgs::SetBinFolder(const char* argv0)
 {
-    const fs::path path(utils::GetExecutablePath());
+    const fs::path path(argv0);
     m_bin_folder = path.parent_path().string();
 }
 
@@ -191,7 +190,7 @@ bool LinkerArgs::ParseArgs(const int argc, const char** argv, bool& shouldContin
         return true;
     }
 
-    SetBinFolder();
+    SetBinFolder(argv[0]);
 
     m_project_specifiers_to_build = m_argument_parser.GetArguments();
     if (m_project_specifiers_to_build.empty())

src/Linker/LinkerArgs.h

@@ -37,7 +37,7 @@ private:
     void PrintUsage() const;
     static void PrintVersion();
 
-    void SetBinFolder();
+    void SetBinFolder(const char* argv0);
     void SetVerbose(bool isVerbose);
 
     ArgumentParser m_argument_parser;

src/Linker/LinkerPaths.cpp

@@ -3,7 +3,6 @@
 #include "SearchPath/IWD.h"
 #include "SearchPath/SearchPathFilesystem.h"
 #include "SearchPath/SearchPaths.h"
-#include "Utils/StringUtils.h"
 
 #include <cassert>
 #include <cstdint>
@@ -56,8 +55,8 @@ namespace
         void CreateFromString(const std::string& templateString)
         {
             const auto templateStringLength = templateString.size();
-            auto partStart = 0uz;
+            auto partStart = 0u;
-            for (auto i = 0uz; i < templateStringLength; i++)
+            for (auto i = 0u; i < templateStringLength; i++)
             {
                 if (templateString[i] != '?')
                     continue;
@@ -216,10 +215,7 @@ namespace
             {
                 if (!curTemplate.CanRender(PROJECT_MASK) && curTemplate.CanRender(GAME_MASK))
                 {
-                    std::string gameName(GameId_Names[static_cast<unsigned>(game)]);
+                    auto renderedTemplate = curTemplate.Render(m_bin_dir, m_base_dir, projectName, GameId_Names[static_cast<unsigned>(game)]);
-                    utils::MakeStringLowerCase(gameName);
-
-                    auto renderedTemplate = curTemplate.Render(m_bin_dir, m_base_dir, projectName, gameName);
                     if (AddSearchPath(addedSearchPaths, searchPaths, renderedTemplate))
                         hasSearchPath = true;
                 }
@@ -314,8 +310,8 @@ namespace
 
 std::unique_ptr<ILinkerPaths> ILinkerPaths::FromArgs(const LinkerArgs& args)
 {
-    std::string normalizedBinPath = fs::weakly_canonical(args.m_bin_folder).make_preferred().string();
+    std::string normalizedBinPath = fs::canonical(args.m_bin_folder).make_preferred().string();
-    std::string normalizedBasePath = fs::weakly_canonical(args.m_base_folder).make_preferred().string();
+    std::string normalizedBasePath = fs::canonical(args.m_base_folder).make_preferred().string();
 
     LinkerSearchPathBuilder assetSearchPaths("asset", normalizedBinPath, normalizedBasePath);
     assetSearchPaths.BuildFromArgs(args.m_asset_search_paths);

src/ObjCommon/Csv/CsvHeaderRow.cpp

@@ -21,7 +21,7 @@ bool CsvHeaderRow::RequireIndexForHeader(const std::string& headerName, unsigned
     if (existingHeader == m_header_row.end())
         return false;
 
-    out = static_cast<unsigned>(std::distance(m_header_row.begin(), existingHeader));
+    out = std::distance(m_header_row.begin(), existingHeader);
     return true;
 }
 

src/ObjCommon/Csv/CsvHeaderRow.h

@@ -13,7 +13,7 @@ public:
 
     bool Read(const CsvInputStream& inputStream);
 
-    [[nodiscard]] const std::string& HeaderNameForColumn(unsigned columnIndex) const;
+    const std::string& HeaderNameForColumn(unsigned columnIndex) const;
     bool RequireIndexForHeader(const std::string& headerName, unsigned& out) const;
     [[nodiscard]] std::optional<unsigned> GetIndexForHeader(const std::string& headerName) const;
 

src/ObjCommon/ObjContainer/IPak/IPakTypes.h

@@ -16,7 +16,7 @@ namespace ipak_consts
     static constexpr size_t IPAK_CHUNK_SIZE = 0x8000;
     static constexpr size_t IPAK_CHUNK_COUNT_PER_READ = 0x8;
 
-    static constexpr size_t IPAK_COMMAND_DEFAULT_SIZE = 0x7F00;
+    static constexpr uint32_t IPAK_COMMAND_DEFAULT_SIZE = 0x7F00;
     static constexpr uint32_t IPAK_COMMAND_UNCOMPRESSED = 0;
     static constexpr uint32_t IPAK_COMMAND_COMPRESSED = 1;
     static constexpr uint32_t IPAK_COMMAND_SKIP = 0xCF;

src/ObjCommon/Sound/FlacDecoder.cpp

@@ -68,7 +68,7 @@ namespace
                 T result;
             } data{};
 
-            const auto byteCount = utils::Align(bitCount, 8uz) / 8uz;
+            const auto byteCount = utils::Align(bitCount, 8u) / 8u;
             assert(byteCount <= sizeof(T));
 
             const auto shiftCount = (8u - bitCount % 8) % 8;
@@ -83,7 +83,7 @@ namespace
 
             while (remainingBits > 0)
             {
-                const auto curBits = static_cast<uint8_t>(std::min(remainingBits, 8uz));
+                const auto curBits = static_cast<uint8_t>(std::min(remainingBits, 8u));
 
                 if (m_remaining_bits_last_byte > 0)
                 {

src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp

@@ -42,14 +42,14 @@ uint32_t CommonStructuredDataEnum::CalculateChecksum(const uint32_t initialValue
 {
     auto checksum = initialValue;
 
-    checksum = crc32(checksum, reinterpret_cast<const Bytef*>(m_name.c_str()), static_cast<unsigned>(m_name.size() + 1u));
+    checksum = crc32(checksum, reinterpret_cast<const Bytef*>(m_name.c_str()), m_name.size() + 1);
 
     const auto littleEndianElementCount = endianness::ToLittleEndian(ElementCount());
     checksum = crc32(checksum, reinterpret_cast<const Bytef*>(&littleEndianElementCount), sizeof(littleEndianElementCount));
 
     for (const auto& entry : m_entries)
     {
-        checksum = crc32(checksum, reinterpret_cast<const Bytef*>(entry.m_name.c_str()), static_cast<unsigned>(entry.m_name.size() + 1));
+        checksum = crc32(checksum, reinterpret_cast<const Bytef*>(entry.m_name.c_str()), entry.m_name.size() + 1);
 
         const auto littleEndianValue = endianness::ToLittleEndian(entry.m_value);
         checksum = crc32(checksum, reinterpret_cast<const Bytef*>(&littleEndianValue), sizeof(littleEndianValue));

src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp

@@ -41,10 +41,10 @@ uint32_t CommonStructuredDataStruct::CalculateChecksum(const CommonStructuredDat
 {
     auto checksum = initialValue;
 
-    checksum = crc32(checksum, reinterpret_cast<const Bytef*>(m_name.c_str()), static_cast<unsigned>(m_name.size() + 1u));
+    checksum = crc32(checksum, reinterpret_cast<const Bytef*>(m_name.c_str()), m_name.size() + 1);
     for (const auto& property : m_properties)
     {
-        checksum = crc32(checksum, reinterpret_cast<const Bytef*>(property.m_name.c_str()), static_cast<unsigned>(property.m_name.size() + 1u));
+        checksum = crc32(checksum, reinterpret_cast<const Bytef*>(property.m_name.c_str()), property.m_name.size() + 1);
 
         const auto littleEndianOffset = endianness::ToLittleEndian(property.m_offset_in_bits);
         checksum = crc32(checksum, reinterpret_cast<const Bytef*>(&littleEndianOffset), sizeof(littleEndianOffset));
@@ -68,7 +68,7 @@ uint32_t CommonStructuredDataStruct::CalculateChecksum(const CommonStructuredDat
                 if (currentType.m_info.type_index < def.m_enums.size())
                 {
                     const auto& _enum = *def.m_enums[currentType.m_info.type_index];
-                    checksum = crc32(checksum, reinterpret_cast<const Bytef*>(_enum.m_name.c_str()), static_cast<unsigned>(_enum.m_name.size() + 1u));
+                    checksum = crc32(checksum, reinterpret_cast<const Bytef*>(_enum.m_name.c_str()), _enum.m_name.size() + 1);
                     currentType = CommonStructuredDataType(CommonStructuredDataTypeCategory::UNKNOWN);
                 }
                 break;
@@ -76,7 +76,7 @@ uint32_t CommonStructuredDataStruct::CalculateChecksum(const CommonStructuredDat
                 if (currentType.m_info.type_index < def.m_structs.size())
                 {
                     const auto& _struct = *def.m_structs[currentType.m_info.type_index];
-                    checksum = crc32(checksum, reinterpret_cast<const Bytef*>(_struct.m_name.c_str()), static_cast<unsigned>(_struct.m_name.size() + 1u));
+                    checksum = crc32(checksum, reinterpret_cast<const Bytef*>(_struct.m_name.c_str()), _struct.m_name.size() + 1);
                     currentType = CommonStructuredDataType(CommonStructuredDataTypeCategory::UNKNOWN);
                 }
                 break;
@@ -99,7 +99,7 @@ uint32_t CommonStructuredDataStruct::CalculateChecksum(const CommonStructuredDat
                     if (enumedArray.m_enum_index < def.m_enums.size())
                     {
                         const auto& _enum = *def.m_enums[enumedArray.m_enum_index];
-                        checksum = crc32(checksum, reinterpret_cast<const Bytef*>(_enum.m_name.c_str()), static_cast<unsigned>(_enum.m_name.size() + 1u));
+                        checksum = crc32(checksum, reinterpret_cast<const Bytef*>(_enum.m_name.c_str()), _enum.m_name.size() + 1);
                     }
                     currentType = enumedArray.m_array_type;
                 }

src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h

@@ -1,6 +1,6 @@
 #pragma once
-
 #include "CommonStructuredDataTypes.h"
+#include "Utils/ClassUtils.h"
 
 #include <cstdint>
 #include <string>
@@ -8,29 +8,29 @@
 
 struct CommonStructuredDataStructProperty
 {
-    CommonStructuredDataStructProperty();
-    explicit CommonStructuredDataStructProperty(std::string name);
-    CommonStructuredDataStructProperty(std::string name, CommonStructuredDataType type, size_t offsetInBits);
-
     std::string m_name;
     CommonStructuredDataType m_type;
     size_t m_offset_in_bits;
+
+    CommonStructuredDataStructProperty();
+    explicit CommonStructuredDataStructProperty(std::string name);
+    CommonStructuredDataStructProperty(std::string name, CommonStructuredDataType type, size_t offsetInBits);
 };
 
 class CommonStructuredDataDef;
 
 struct CommonStructuredDataStruct
 {
-    CommonStructuredDataStruct();
-    explicit CommonStructuredDataStruct(std::string name);
-
-    [[nodiscard]] uint32_t CalculateChecksum(const CommonStructuredDataDef& def, uint32_t initialValue) const;
-
-    void SortPropertiesByOffset();
-    void SortPropertiesByName();
-
     std::string m_name;
     std::vector<CommonStructuredDataStructProperty> m_properties;
     size_t m_bit_offset;
     size_t m_size_in_byte;
+
+    CommonStructuredDataStruct();
+    explicit CommonStructuredDataStruct(std::string name);
+
+    _NODISCARD uint32_t CalculateChecksum(const CommonStructuredDataDef& def, uint32_t initialValue) const;
+
+    void SortPropertiesByOffset();
+    void SortPropertiesByName();
 };

src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.cpp

@@ -59,7 +59,7 @@ size_t CommonStructuredDataType::GetSizeInBits(const CommonStructuredDataDef& de
             return 0u;
         }
         const auto& indexedArray = def.m_indexed_arrays[m_info.type_index];
-        return utils::Align(indexedArray.m_element_size_in_bits * indexedArray.m_element_count, 8uz);
+        return utils::Align(indexedArray.m_element_size_in_bits * indexedArray.m_element_count, 8u);
     }
     case CommonStructuredDataTypeCategory::ENUM_ARRAY:
     {
@@ -69,7 +69,7 @@ size_t CommonStructuredDataType::GetSizeInBits(const CommonStructuredDataDef& de
             return 0u;
         }
         const auto& enumedArray = def.m_enumed_arrays[m_info.type_index];
-        return utils::Align(enumedArray.m_element_size_in_bits * enumedArray.m_element_count, 8uz);
+        return utils::Align(enumedArray.m_element_size_in_bits * enumedArray.m_element_count, 8u);
     }
 
     case CommonStructuredDataTypeCategory::UNKNOWN:

src/ObjCompiling/Game/IW3/ObjCompilerIW3.cpp

@@ -11,7 +11,7 @@ namespace
 {
     void ConfigureCompilers(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         // No compilers yet
     }
@@ -23,7 +23,7 @@ namespace
                                  ZoneAssetCreationStateContainer& zoneStates,
                                  IOutputPath& outDir)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         if (ImageIwdPostProcessor<AssetImage>::AppliesToZoneDefinition(zoneDefinition))
             collection.AddAssetPostProcessor(std::make_unique<ImageIwdPostProcessor<AssetImage>>(zoneDefinition, searchPath, zoneStates, outDir));

src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp

@@ -11,7 +11,7 @@ namespace
 {
     void ConfigureCompilers(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         // No compilers yet
     }
@@ -23,7 +23,7 @@ namespace
                                  ZoneAssetCreationStateContainer& zoneStates,
                                  IOutputPath& outDir)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         if (ImageIwdPostProcessor<AssetImage>::AppliesToZoneDefinition(zoneDefinition))
             collection.AddAssetPostProcessor(std::make_unique<ImageIwdPostProcessor<AssetImage>>(zoneDefinition, searchPath, zoneStates, outDir));

src/ObjCompiling/Game/IW5/ObjCompilerIW5.cpp

@@ -11,7 +11,7 @@ namespace
 {
     void ConfigureCompilers(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         // No compilers yet
     }
@@ -23,7 +23,7 @@ namespace
                                  ZoneAssetCreationStateContainer& zoneStates,
                                  IOutputPath& outDir)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         if (ImageIwdPostProcessor<AssetImage>::AppliesToZoneDefinition(zoneDefinition))
             collection.AddAssetPostProcessor(std::make_unique<ImageIwdPostProcessor<AssetImage>>(zoneDefinition, searchPath, zoneStates, outDir));

src/ObjCompiling/Game/T5/ObjCompilerT5.cpp

@@ -11,7 +11,7 @@ namespace
 {
     void ConfigureCompilers(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         // No compilers yet
     }
@@ -23,7 +23,7 @@ namespace
                                  ZoneAssetCreationStateContainer& zoneStates,
                                  IOutputPath& outDir)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         if (ImageIwdPostProcessor<AssetImage>::AppliesToZoneDefinition(zoneDefinition))
             collection.AddAssetPostProcessor(std::make_unique<ImageIwdPostProcessor<AssetImage>>(zoneDefinition, searchPath, zoneStates, outDir));

src/ObjCompiling/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6.cpp

@@ -6,6 +6,7 @@
 
 #include <cassert>
 #include <format>
+#include <iostream>
 
 using namespace T6;
 
@@ -41,7 +42,7 @@ namespace
 
             auto* gameKvps = m_memory.Alloc<KeyValuePairs>();
             gameKvps->name = m_memory.Dup(m_zone.m_name.c_str());
-            gameKvps->numVariables = static_cast<unsigned>(commonKvps.size());
+            gameKvps->numVariables = commonKvps.size();
             gameKvps->keyValuePairs = m_memory.Alloc<KeyValuePair>(commonKvps.size());
 
             const auto namespaceHash = Common::Com_HashKey(m_zone.m_name.c_str(), 64);

src/ObjCompiling/Game/T6/ObjCompilerT6.cpp

@@ -17,7 +17,7 @@ namespace
                             ISearchPath& searchPath,
                             ZoneAssetCreationStateContainer& zoneStates)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         collection.AddAssetCreator(CreateKeyValuePairsCompiler(memory, zone, zoneDefinition.m_zone_definition, zoneStates));
     }
@@ -29,7 +29,7 @@ namespace
                                  ZoneAssetCreationStateContainer& zoneStates,
                                  IOutputPath& outDir)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         if (ImageIPakPostProcessor<AssetImage>::AppliesToZoneDefinition(zoneDefinition))
             collection.AddAssetPostProcessor(std::make_unique<ImageIPakPostProcessor<AssetImage>>(zoneDefinition, searchPath, zoneStates, outDir));

src/ObjCompiling/Image/IPak/IPakCreator.cpp

@@ -1,6 +1,7 @@
 #include "IPakCreator.h"
 
 #include "Game/T6/CommonT6.h"
+#include "Game/T6/GameT6.h"
 #include "GitVersion.h"
 #include "ObjContainer/IPak/IPakTypes.h"
 #include "Utils/Alignment.h"
@@ -22,7 +23,7 @@ namespace
         static constexpr char BRANDING[] = "Created with OpenAssetTools " GIT_VERSION;
         static constexpr auto SECTION_COUNT = 3; // Index + Data + Branding
 
-        inline static const auto PAD_DATA = std::string(256, '\xA7');
+        inline static const std::string PAD_DATA = std::string(256, '\xA7');
 
     public:
         IPakWriter(std::ostream& stream, ISearchPath& searchPath, const std::vector<std::string>& images)
@@ -69,8 +70,8 @@ namespace
 
         void Write(const void* data, const size_t dataSize)
         {
-            m_stream.write(static_cast<const char*>(data), static_cast<std::streamsize>(dataSize));
+            m_stream.write(static_cast<const char*>(data), dataSize);
-            m_current_offset += static_cast<int64_t>(dataSize);
+            m_current_offset += dataSize;
         }
 
         void Pad(const size_t paddingSize)
@@ -99,30 +100,27 @@ namespace
         {
             GoTo(0);
 
-            const IPakHeader header{.magic = ipak_consts::IPAK_MAGIC,
+            const IPakHeader header{ipak_consts::IPAK_MAGIC, ipak_consts::IPAK_VERSION, static_cast<uint32_t>(m_total_size), SECTION_COUNT};
-                                    .version = ipak_consts::IPAK_VERSION,
-                                    .size = static_cast<uint32_t>(m_total_size),
-                                    .sectionCount = SECTION_COUNT};
 
             const IPakSection dataSection{
-                .type = ipak_consts::IPAK_DATA_SECTION,
+                ipak_consts::IPAK_DATA_SECTION,
-                .offset = static_cast<uint32_t>(m_data_section_offset),
+                static_cast<uint32_t>(m_data_section_offset),
-                .size = static_cast<uint32_t>(m_data_section_size),
+                static_cast<uint32_t>(m_data_section_size),
-                .itemCount = static_cast<uint32_t>(m_index_entries.size()),
+                static_cast<uint32_t>(m_index_entries.size()),
             };
 
             const IPakSection indexSection{
-                .type = ipak_consts::IPAK_INDEX_SECTION,
+                ipak_consts::IPAK_INDEX_SECTION,
-                .offset = static_cast<uint32_t>(m_index_section_offset),
+                static_cast<uint32_t>(m_index_section_offset),
-                .size = static_cast<uint32_t>(sizeof(IPakIndexEntry) * m_index_entries.size()),
+                static_cast<uint32_t>(sizeof(IPakIndexEntry) * m_index_entries.size()),
-                .itemCount = static_cast<uint32_t>(m_index_entries.size()),
+                static_cast<uint32_t>(m_index_entries.size()),
             };
 
             const IPakSection brandingSection{
-                .type = ipak_consts::IPAK_BRANDING_SECTION,
+                ipak_consts::IPAK_BRANDING_SECTION,
-                .offset = static_cast<uint32_t>(m_branding_section_offset),
+                static_cast<uint32_t>(m_branding_section_offset),
-                .size = std::extent_v<decltype(BRANDING)>,
+                std::extent_v<decltype(BRANDING)>,
-                .itemCount = 1,
+                1,
             };
 
             Write(&header, sizeof(header));
@@ -149,7 +147,7 @@ namespace
 
             imageSize = static_cast<size_t>(openFile.m_length);
             auto imageData = std::make_unique<char[]>(imageSize);
-            openFile.m_stream->read(imageData.get(), static_cast<std::streamsize>(imageSize));
+            openFile.m_stream->read(imageData.get(), imageSize);
 
             return imageData;
         }
@@ -179,7 +177,7 @@ namespace
                 IPakDataBlockHeader skipBlockHeader{};
                 skipBlockHeader.countAndOffset.count = 1;
                 skipBlockHeader.commands[0].compressed = ipak_consts::IPAK_COMMAND_SKIP;
-                skipBlockHeader.commands[0].size = static_cast<uint32_t>(sizeToSkip - sizeof(IPakDataBlockHeader));
+                skipBlockHeader.commands[0].size = sizeToSkip - sizeof(IPakDataBlockHeader);
                 Write(&skipBlockHeader, sizeof(skipBlockHeader));
             }
 
@@ -201,12 +199,12 @@ namespace
             m_current_block.countAndOffset.offset = static_cast<uint32_t>(m_file_offset);
 
             // Reserve space to later write actual block header data
-            GoTo(static_cast<int64_t>(m_current_offset + sizeof(IPakDataBlockHeader)));
+            GoTo(m_current_offset + sizeof(IPakDataBlockHeader));
         }
 
         void WriteChunkData(const void* data, const size_t dataSize)
         {
-            auto dataOffset = 0uz;
+            auto dataOffset = 0u;
             while (dataOffset < dataSize)
             {
                 if (m_current_block.countAndOffset.count >= std::extent_v<decltype(IPakDataBlockHeader::commands)>)
@@ -218,7 +216,7 @@ namespace
                 const auto remainingSize = dataSize - dataOffset;
                 const auto remainingChunkBufferWindowSize = std::max((ipak_consts::IPAK_CHUNK_COUNT_PER_READ * ipak_consts::IPAK_CHUNK_SIZE)
                                                                          - static_cast<size_t>(m_current_offset - m_chunk_buffer_window_start),
-                                                                     0uz);
+                                                                     0u);
 
                 if (remainingChunkBufferWindowSize == 0)
                 {
@@ -227,7 +225,7 @@ namespace
                     continue;
                 }
 
-                const auto commandSize = std::min({remainingSize, ipak_consts::IPAK_COMMAND_DEFAULT_SIZE, remainingChunkBufferWindowSize});
+                const auto commandSize = std::min(std::min(remainingSize, ipak_consts::IPAK_COMMAND_DEFAULT_SIZE), remainingChunkBufferWindowSize);
 
                 auto writeUncompressed = true;
                 if (USE_IPAK_COMPRESSION)
@@ -256,7 +254,7 @@ namespace
                     Write(&static_cast<const char*>(data)[dataOffset], commandSize);
 
                     const auto currentCommand = m_current_block.countAndOffset.count;
-                    m_current_block.commands[currentCommand].size = static_cast<uint32_t>(commandSize);
+                    m_current_block.commands[currentCommand].size = commandSize;
                     m_current_block.commands[currentCommand].compressed = ipak_consts::IPAK_COMMAND_UNCOMPRESSED;
                     m_current_block.countAndOffset.count = currentCommand + 1u;
                 }
@@ -283,7 +281,7 @@ namespace
                 return;
 
             const auto nameHash = T6::Common::R_HashString(imageName.c_str(), 0);
-            const auto dataHash = static_cast<unsigned>(crc32(0u, reinterpret_cast<const Bytef*>(imageData.get()), static_cast<unsigned>(imageSize)));
+            const auto dataHash = static_cast<unsigned>(crc32(0u, reinterpret_cast<const Bytef*>(imageData.get()), imageSize));
 
             StartNewFile();
             const auto startOffset = m_current_block_header_offset;
@@ -296,7 +294,7 @@ namespace
             WriteChunkData(imageData.get(), imageSize);
             const auto writtenImageSize = static_cast<size_t>(m_current_offset - startOffset);
 
-            indexEntry.size = static_cast<uint32_t>(writtenImageSize);
+            indexEntry.size = writtenImageSize;
             m_index_entries.emplace_back(indexEntry);
         }
 

src/ObjImage/Image/DdsLoader.cpp

@@ -14,28 +14,16 @@ namespace dds
     {
         static constexpr auto DDS_MAGIC = FileUtils::MakeMagic32('D', 'D', 'S', ' ');
 
-    public:
+        std::istream& m_stream;
-        explicit DdsLoaderInternal(std::istream& stream)
-            : m_stream(stream),
-              m_texture_type(TextureType::T_2D),
-              m_has_mip_maps(false),
-              m_width(0u),
-              m_height(0u),
-              m_depth(0u),
-              m_format(nullptr)
-        {
-        }
 
-        std::unique_ptr<Texture> LoadDds()
+        TextureType m_texture_type;
-        {
+        bool m_has_mip_maps;
-            if (!ReadMagic() || !ReadHeader())
+        size_t m_width;
-                return nullptr;
+        size_t m_height;
+        size_t m_depth;
+        const ImageFormat* m_format;
 
-            return ReadTextureData();
+        _NODISCARD bool ReadMagic() const
-        }
-
-    private:
-        [[nodiscard]] bool ReadMagic() const
         {
             uint32_t magic;
             m_stream.read(reinterpret_cast<char*>(&magic), sizeof(magic));
@@ -54,7 +42,7 @@ namespace dds
             return true;
         }
 
-        [[nodiscard]] bool ReadDxt10Header()
+        _NODISCARD bool ReadDxt10Header()
         {
             DDS_HEADER_DXT10 headerDx10{};
             m_stream.read(reinterpret_cast<char*>(&headerDx10), sizeof(headerDx10));
@@ -98,7 +86,7 @@ namespace dds
             return false;
         }
 
-        [[nodiscard]] bool ReadPixelFormatFourCc(DDS_PIXELFORMAT& pf)
+        _NODISCARD bool ReadPixelFormatFourCc(DDS_PIXELFORMAT& pf)
         {
             switch (pf.dwFourCC)
             {
@@ -144,7 +132,7 @@ namespace dds
             }
         }
 
-        [[nodiscard]] bool ReadPixelFormatUnsigned(DDS_PIXELFORMAT& pf)
+        _NODISCARD bool ReadPixelFormatUnsigned(DDS_PIXELFORMAT& pf)
         {
             unsigned rOffset, rSize, gOffset, gSize, bOffset, bSize, aOffset, aSize;
 
@@ -175,7 +163,7 @@ namespace dds
             return false;
         }
 
-        [[nodiscard]] bool ReadPixelFormat(DDS_PIXELFORMAT& pf)
+        _NODISCARD bool ReadPixelFormat(DDS_PIXELFORMAT& pf)
         {
             if (pf.dwFlags & DDPF_FOURCC)
                 return ReadPixelFormatFourCc(pf);
@@ -196,11 +184,7 @@ namespace dds
             m_width = header.dwWidth;
             m_height = header.dwHeight;
             m_depth = header.dwDepth;
-
+            m_has_mip_maps = (header.dwCaps & DDSCAPS_MIPMAP) != 0 || header.dwMipMapCount > 1;
-            // Best thing to do here would be to check (header.dwCaps & DDSCAPS_MIPMAP) != 0 but some tools just create bad files
-            // I encountered both files that have the flag without them actually having mipmaps (mipMapCount == 1)
-            // and also files that have mipMapCount > 1 but not the flag
-            m_has_mip_maps = header.dwMipMapCount > 1;
 
             if (header.dwCaps2 & DDSCAPS2_CUBEMAP)
                 m_texture_type = TextureType::T_CUBE;
@@ -212,7 +196,7 @@ namespace dds
             return ReadPixelFormat(header.ddspf);
         }
 
-        [[nodiscard]] std::unique_ptr<Texture> ReadTextureData() const
+        _NODISCARD std::unique_ptr<Texture> ReadTextureData() const
         {
             std::unique_ptr<Texture> result;
 
@@ -241,7 +225,7 @@ namespace dds
 
             for (auto mipLevel = 0; mipLevel < mipMapCount; mipLevel++)
             {
-                const auto mipSize = static_cast<std::streamsize>(result->GetSizeOfMipLevel(mipLevel));
+                const auto mipSize = result->GetSizeOfMipLevel(mipLevel);
 
                 for (auto face = 0; face < faceCount; face++)
                 {
@@ -258,14 +242,25 @@ namespace dds
             return result;
         }
 
-        std::istream& m_stream;
+    public:
+        explicit DdsLoaderInternal(std::istream& stream)
+            : m_stream(stream),
+              m_texture_type(TextureType::T_2D),
+              m_has_mip_maps(false),
+              m_width(0u),
+              m_height(0u),
+              m_depth(0u),
+              m_format(nullptr)
+        {
+        }
 
-        TextureType m_texture_type;
+        std::unique_ptr<Texture> LoadDds()
-        bool m_has_mip_maps;
+        {
-        unsigned m_width;
+            if (!ReadMagic() || !ReadHeader())
-        unsigned m_height;
+                return nullptr;
-        unsigned m_depth;
+
-        const ImageFormat* m_format;
+            return ReadTextureData();
+        }
     };
 
     std::unique_ptr<Texture> LoadDds(std::istream& stream)

src/ObjImage/Image/DdsWriter.cpp

@@ -55,7 +55,7 @@ public:
         {
             const auto* buffer = m_texture->GetBufferForMipLevel(mipLevel);
             const auto mipLevelSize = m_texture->GetSizeOfMipLevel(mipLevel) * m_texture->GetFaceCount();
-            m_stream.write(reinterpret_cast<const char*>(buffer), static_cast<std::streamsize>(mipLevelSize));
+            m_stream.write(reinterpret_cast<const char*>(buffer), mipLevelSize);
         }
     }
 
@@ -153,7 +153,7 @@ public:
         header.dwHeight = m_texture->GetHeight();
         header.dwWidth = m_texture->GetWidth();
         header.dwDepth = m_texture->GetDepth();
-        header.dwPitchOrLinearSize = static_cast<uint32_t>(m_texture->GetFormat()->GetPitch(0, m_texture->GetWidth()));
+        header.dwPitchOrLinearSize = m_texture->GetFormat()->GetPitch(0, m_texture->GetWidth());
         header.dwMipMapCount = m_texture->HasMipMaps() ? m_texture->GetMipMapCount() : 1;
 
         PopulatePixelFormat(header.ddspf);

src/ObjImage/Image/Dx12TextureLoader.cpp

@@ -14,7 +14,7 @@ Dx12TextureLoader::Dx12TextureLoader()
 
 const ImageFormat* Dx12TextureLoader::GetFormatForDx12Format() const
 {
-    for (const auto* i : ImageFormat::ALL_FORMATS)
+    for (auto i : ImageFormat::ALL_FORMATS)
     {
         if (i->GetDxgiFormat() == m_format)
             return i;
@@ -41,19 +41,19 @@ Dx12TextureLoader& Dx12TextureLoader::HasMipMaps(const bool hasMipMaps)
     return *this;
 }
 
-Dx12TextureLoader& Dx12TextureLoader::Width(const unsigned width)
+Dx12TextureLoader& Dx12TextureLoader::Width(const size_t width)
 {
     m_width = width;
     return *this;
 }
 
-Dx12TextureLoader& Dx12TextureLoader::Height(const unsigned height)
+Dx12TextureLoader& Dx12TextureLoader::Height(const size_t height)
 {
     m_height = height;
     return *this;
 }
 
-Dx12TextureLoader& Dx12TextureLoader::Depth(const unsigned depth)
+Dx12TextureLoader& Dx12TextureLoader::Depth(const size_t depth)
 {
     m_depth = depth;
     return *this;

src/ObjImage/Image/Dx12TextureLoader.h

@@ -2,6 +2,8 @@
 
 #include "Image/DxgiFormat.h"
 #include "Image/Texture.h"
+#include "Utils/ClassUtils.h"
+#include "Utils/MemoryManager.h"
 
 #include <memory>
 #include <unordered_map>
@@ -14,21 +16,21 @@ public:
     Dx12TextureLoader& Format(oat::DXGI_FORMAT format);
     Dx12TextureLoader& Type(TextureType textureType);
     Dx12TextureLoader& HasMipMaps(bool hasMipMaps);
-    Dx12TextureLoader& Width(unsigned width);
+    Dx12TextureLoader& Width(size_t width);
-    Dx12TextureLoader& Height(unsigned height);
+    Dx12TextureLoader& Height(size_t height);
-    Dx12TextureLoader& Depth(unsigned depth);
+    Dx12TextureLoader& Depth(size_t depth);
 
     std::unique_ptr<Texture> LoadTexture(const void* data);
 
 private:
-    [[nodiscard]] const ImageFormat* GetFormatForDx12Format() const;
+    _NODISCARD const ImageFormat* GetFormatForDx12Format() const;
 
     static std::unordered_map<ImageFormatId, ImageFormatId> m_conversion_table;
 
     oat::DXGI_FORMAT m_format;
     TextureType m_type;
     bool m_has_mip_maps;
-    unsigned m_width;
+    size_t m_width;
-    unsigned m_height;
+    size_t m_height;
-    unsigned m_depth;
+    size_t m_depth;
 };

src/ObjImage/Image/Dx9TextureLoader.cpp

@@ -41,19 +41,19 @@ Dx9TextureLoader& Dx9TextureLoader::HasMipMaps(const bool hasMipMaps)
     return *this;
 }
 
-Dx9TextureLoader& Dx9TextureLoader::Width(const unsigned width)
+Dx9TextureLoader& Dx9TextureLoader::Width(const size_t width)
 {
     m_width = width;
     return *this;
 }
 
-Dx9TextureLoader& Dx9TextureLoader::Height(const unsigned height)
+Dx9TextureLoader& Dx9TextureLoader::Height(const size_t height)
 {
     m_height = height;
     return *this;
 }
 
-Dx9TextureLoader& Dx9TextureLoader::Depth(const unsigned depth)
+Dx9TextureLoader& Dx9TextureLoader::Depth(const size_t depth)
 {
     m_depth = depth;
     return *this;

src/ObjImage/Image/Dx9TextureLoader.h

@@ -2,8 +2,11 @@
 
 #include "Image/D3DFormat.h"
 #include "Image/Texture.h"
+#include "Utils/ClassUtils.h"
+#include "Utils/MemoryManager.h"
 
 #include <memory>
+#include <unordered_map>
 
 class Dx9TextureLoader
 {
@@ -13,19 +16,19 @@ public:
     Dx9TextureLoader& Format(oat::D3DFORMAT format);
     Dx9TextureLoader& Type(TextureType textureType);
     Dx9TextureLoader& HasMipMaps(bool hasMipMaps);
-    Dx9TextureLoader& Width(unsigned width);
+    Dx9TextureLoader& Width(size_t width);
-    Dx9TextureLoader& Height(unsigned height);
+    Dx9TextureLoader& Height(size_t height);
-    Dx9TextureLoader& Depth(unsigned depth);
+    Dx9TextureLoader& Depth(size_t depth);
 
     std::unique_ptr<Texture> LoadTexture(const void* data);
 
 private:
-    [[nodiscard]] const ImageFormat* GetFormatForDx9Format() const;
+    _NODISCARD const ImageFormat* GetFormatForDx9Format() const;
 
     oat::D3DFORMAT m_format;
     TextureType m_type;
     bool m_has_mip_maps;
-    unsigned m_width;
+    size_t m_width;
-    unsigned m_height;
+    size_t m_height;
-    unsigned m_depth;
+    size_t m_depth;
 };

src/ObjImage/Image/ImageFormat.h

@@ -48,13 +48,13 @@ protected:
 public:
     virtual ~ImageFormat() = default;
 
-    [[nodiscard]] ImageFormatId GetId() const;
+    ImageFormatId GetId() const;
-    [[nodiscard]] oat::D3DFORMAT GetD3DFormat() const;
+    oat::D3DFORMAT GetD3DFormat() const;
-    [[nodiscard]] oat::DXGI_FORMAT GetDxgiFormat() const;
+    oat::DXGI_FORMAT GetDxgiFormat() const;
 
-    [[nodiscard]] virtual ImageFormatType GetType() const = 0;
+    virtual ImageFormatType GetType() const = 0;
-    [[nodiscard]] virtual size_t GetPitch(unsigned mipLevel, unsigned width) const = 0;
+    virtual size_t GetPitch(unsigned mipLevel, unsigned width) const = 0;
-    [[nodiscard]] virtual size_t GetSizeOfMipLevel(unsigned mipLevel, unsigned width, unsigned height, unsigned depth) const = 0;
+    virtual size_t GetSizeOfMipLevel(unsigned mipLevel, unsigned width, unsigned height, unsigned depth) const = 0;
 
     static const ImageFormatUnsigned FORMAT_R8_G8_B8;
     static const ImageFormatUnsigned FORMAT_B8_G8_R8_X8;
@@ -98,14 +98,14 @@ public:
                         unsigned aOffset,
                         unsigned aSize);
 
-    [[nodiscard]] ImageFormatType GetType() const override;
+    ImageFormatType GetType() const override;
-    [[nodiscard]] size_t GetPitch(unsigned mipLevel, unsigned width) const override;
+    size_t GetPitch(unsigned mipLevel, unsigned width) const override;
-    [[nodiscard]] size_t GetSizeOfMipLevel(unsigned mipLevel, unsigned width, unsigned height, unsigned depth) const override;
+    size_t GetSizeOfMipLevel(unsigned mipLevel, unsigned width, unsigned height, unsigned depth) const override;
 
-    [[nodiscard]] bool HasR() const;
+    bool HasR() const;
-    [[nodiscard]] bool HasG() const;
+    bool HasG() const;
-    [[nodiscard]] bool HasB() const;
+    bool HasB() const;
-    [[nodiscard]] bool HasA() const;
+    bool HasA() const;
 };
 
 class ImageFormatBlockCompressed final : public ImageFormat
@@ -116,7 +116,7 @@ public:
 
     ImageFormatBlockCompressed(ImageFormatId id, oat::D3DFORMAT d3dFormat, oat::DXGI_FORMAT dxgiFormat, unsigned blockSize, unsigned bitsPerBlock);
 
-    [[nodiscard]] ImageFormatType GetType() const override;
+    ImageFormatType GetType() const override;
-    [[nodiscard]] size_t GetPitch(unsigned mipLevel, unsigned width) const override;
+    size_t GetPitch(unsigned mipLevel, unsigned width) const override;
-    [[nodiscard]] size_t GetSizeOfMipLevel(unsigned mipLevel, unsigned width, unsigned height, unsigned depth) const override;
+    size_t GetSizeOfMipLevel(unsigned mipLevel, unsigned width, unsigned height, unsigned depth) const override;
 };

src/ObjImage/Image/IwiWriter13.cpp

@@ -110,20 +110,20 @@ void IwiWriter::DumpImage(std::ostream& stream, const Texture* texture)
         currentFileSize += mipLevelSize;
 
         if (currentMipLevel < static_cast<int>(std::extent_v<decltype(IwiHeader::fileSizeForPicmip)>))
-            header.fileSizeForPicmip[currentMipLevel] = static_cast<uint32_t>(currentFileSize);
+            header.fileSizeForPicmip[currentMipLevel] = currentFileSize;
     }
 
-    if (const auto* texture3D = dynamic_cast<const Texture3D*>(texture))
+    if (const auto* texture2D = dynamic_cast<const Texture2D*>(texture))
     {
-        FillHeader3D(header, *texture3D);
+        FillHeader2D(header, *texture2D);
     }
     else if (const auto* textureCube = dynamic_cast<const TextureCube*>(texture))
     {
         FillHeaderCube(header, *textureCube);
     }
-    else if (const auto* texture2D = dynamic_cast<const Texture2D*>(texture))
+    else if (const auto* texture3D = dynamic_cast<const Texture3D*>(texture))
     {
-        FillHeader2D(header, *texture2D);
+        FillHeader3D(header, *texture3D);
     }
     else
     {

src/ObjImage/Image/IwiWriter27.cpp

@@ -113,20 +113,20 @@ void IwiWriter::DumpImage(std::ostream& stream, const Texture* texture)
         currentFileSize += mipLevelSize;
 
         if (currentMipLevel < static_cast<int>(std::extent_v<decltype(iwi27::IwiHeader::fileSizeForPicmip)>))
-            header.fileSizeForPicmip[currentMipLevel] = static_cast<uint32_t>(currentFileSize);
+            header.fileSizeForPicmip[currentMipLevel] = currentFileSize;
     }
 
-    if (const auto* texture3D = dynamic_cast<const Texture3D*>(texture))
+    if (const auto* texture2D = dynamic_cast<const Texture2D*>(texture))
     {
-        FillHeader3D(header, *texture3D);
+        FillHeader2D(header, *texture2D);
     }
     else if (const auto* textureCube = dynamic_cast<const TextureCube*>(texture))
     {
         FillHeaderCube(header, *textureCube);
     }
-    else if (const auto* texture2D = dynamic_cast<const Texture2D*>(texture))
+    else if (const auto* texture3D = dynamic_cast<const Texture3D*>(texture))
     {
-        FillHeader2D(header, *texture2D);
+        FillHeader3D(header, *texture3D);
     }
     else
     {

src/ObjImage/Image/IwiWriter6.cpp

@@ -105,20 +105,20 @@ void IwiWriter::DumpImage(std::ostream& stream, const Texture* texture)
         currentFileSize += mipLevelSize;
 
         if (currentMipLevel < static_cast<int>(std::extent_v<decltype(IwiHeader::fileSizeForPicmip)>))
-            header.fileSizeForPicmip[currentMipLevel] = static_cast<uint32_t>(currentFileSize);
+            header.fileSizeForPicmip[currentMipLevel] = currentFileSize;
     }
 
-    if (const auto* texture3D = dynamic_cast<const Texture3D*>(texture))
+    if (const auto* texture2D = dynamic_cast<const Texture2D*>(texture))
     {
-        FillHeader3D(header, *texture3D);
+        FillHeader2D(header, *texture2D);
     }
     else if (const auto* textureCube = dynamic_cast<const TextureCube*>(texture))
     {
         FillHeaderCube(header, *textureCube);
     }
-    else if (const auto* texture2D = dynamic_cast<const Texture2D*>(texture))
+    else if (const auto* texture3D = dynamic_cast<const Texture3D*>(texture))
     {
-        FillHeader2D(header, *texture2D);
+        FillHeader3D(header, *texture3D);
     }
     else
     {

src/ObjImage/Image/IwiWriter8.cpp

@@ -105,20 +105,20 @@ void IwiWriter::DumpImage(std::ostream& stream, const Texture* texture)
         currentFileSize += mipLevelSize;
 
         if (currentMipLevel < static_cast<int>(std::extent_v<decltype(IwiHeader::fileSizeForPicmip)>))
-            header.fileSizeForPicmip[currentMipLevel] = static_cast<uint32_t>(currentFileSize);
+            header.fileSizeForPicmip[currentMipLevel] = currentFileSize;
     }
 
-    if (const auto* texture3D = dynamic_cast<const Texture3D*>(texture))
+    if (const auto* texture2D = dynamic_cast<const Texture2D*>(texture))
     {
-        FillHeader3D(header, *texture3D);
+        FillHeader2D(header, *texture2D);
     }
     else if (const auto* textureCube = dynamic_cast<const TextureCube*>(texture))
     {
         FillHeaderCube(header, *textureCube);
     }
-    else if (const auto* texture2D = dynamic_cast<const Texture2D*>(texture))
+    else if (const auto* texture3D = dynamic_cast<const Texture3D*>(texture))
     {
-        FillHeader2D(header, *texture2D);
+        FillHeader3D(header, *texture3D);
     }
     else
     {

src/ObjLoading.lua

@@ -55,7 +55,7 @@ function ObjLoading:project()
 		useSourceTemplating("ObjLoading")
 		
 		self:include(includes)
-		Cryptography:include(includes)
+		Crypto:include(includes)
 		Utils:include(includes)
 		minilzo:include(includes)
 		minizip:include(includes)

src/ObjLoading/Asset/AssetCreationContext.cpp

@@ -65,10 +65,8 @@ std::unique_ptr<XAssetInfoGeneric> GenericAssetRegistration::CreateXAssetInfo()
 AssetCreationContext::AssetCreationContext(Zone& zone, const AssetCreatorCollection* creators, const IgnoredAssetLookup* ignoredAssetLookup)
     : ZoneAssetCreationStateContainer(zone),
       m_zone(zone),
-      m_forced_asset_pools(ZoneAssetPools::CreateForGame(zone.m_game->GetId(), &zone, zone.m_priority)),
       m_creators(creators),
-      m_ignored_asset_lookup(ignoredAssetLookup),
+      m_ignored_asset_lookup(ignoredAssetLookup)
-      m_forced_load_depth(0u)
 {
 }
 
@@ -80,14 +78,10 @@ XAssetInfoGeneric* AssetCreationContext::AddAssetGeneric(GenericAssetRegistratio
     const auto assetType = xAssetInfo->m_type;
     const auto* pAssetName = xAssetInfo->m_name.c_str();
 
-    XAssetInfoGeneric* addedAsset;
+    auto* addedAsset = m_zone.m_pools->AddAsset(std::move(xAssetInfo));
-    if (m_forced_load_depth > 0)
-        addedAsset = m_forced_asset_pools->AddAsset(std::move(xAssetInfo));
-    else
-        addedAsset = m_zone.m_pools->AddAsset(std::move(xAssetInfo));
-
     if (addedAsset == nullptr)
         std::cerr << std::format("Failed to add asset of type \"{}\" to pool: \"{}\"\n", *m_zone.m_pools->GetAssetTypeName(assetType), pAssetName);
+
     return addedAsset;
 }
 
@@ -108,16 +102,6 @@ XAssetInfoGeneric* AssetCreationContext::LoadDependencyGeneric(const asset_type_
     if (alreadyLoadedAsset)
         return alreadyLoadedAsset;
 
-    if (m_forced_load_depth > 0)
-    {
-        alreadyLoadedAsset = m_forced_asset_pools->GetAssetOrAssetReference(assetType, assetName);
-        if (alreadyLoadedAsset)
-            return alreadyLoadedAsset;
-
-        // If we are already force loading an asset we should not load its dependencies
-        return LoadDefaultAssetDependency(assetType, std::format(",{}", assetName));
-    }
-
     if (m_ignored_asset_lookup->IsAssetIgnored(assetType, assetName))
         return LoadDefaultAssetDependency(assetType, std::format(",{}", assetName));
 
@@ -137,9 +121,9 @@ XAssetInfoGeneric* AssetCreationContext::LoadDependencyGeneric(const asset_type_
     return nullptr;
 }
 
-IndirectAssetReference AssetCreationContext::LoadIndirectAssetReferenceGeneric(const asset_type_t assetType, const std::string& assetName)
+IndirectAssetReference AssetCreationContext::LoadIndirectAssetReferenceGeneric(asset_type_t assetType, const std::string& assetName)
 {
-    const auto* alreadyLoadedAsset = m_zone.m_pools->GetAssetOrAssetReference(assetType, assetName);
+    auto* alreadyLoadedAsset = m_zone.m_pools->GetAssetOrAssetReference(assetType, assetName);
     if (alreadyLoadedAsset)
         return IndirectAssetReference(assetType, assetName);
 
@@ -153,44 +137,3 @@ IndirectAssetReference AssetCreationContext::LoadIndirectAssetReferenceGeneric(c
     }
     return IndirectAssetReference(assetType, assetName);
 }
-
-XAssetInfoGeneric* AssetCreationContext::ForceLoadDependencyGeneric(const asset_type_t assetType, const std::string& assetName)
-{
-    auto* alreadyLoadedAsset = m_zone.m_pools->GetAssetOrAssetReference(assetType, assetName);
-    if (alreadyLoadedAsset && !alreadyLoadedAsset->IsReference())
-        return alreadyLoadedAsset;
-    alreadyLoadedAsset = m_forced_asset_pools->GetAssetOrAssetReference(assetType, assetName);
-    if (alreadyLoadedAsset && !alreadyLoadedAsset->IsReference())
-        return alreadyLoadedAsset;
-
-    auto result = AssetCreationResult::NoAction();
-    if (m_ignored_asset_lookup->IsAssetIgnored(assetType, assetName))
-    {
-        // Load default asset to zone
-        if (!LoadDefaultAssetDependency(assetType, std::format(",{}", assetName)))
-            return nullptr;
-
-        ++m_forced_load_depth;
-
-        result = m_creators->CreateAsset(assetType, assetName, *this);
-
-        assert(m_forced_load_depth > 0);
-        m_forced_load_depth = std::min(m_forced_load_depth - 1u, 0u);
-    }
-    else
-        result = m_creators->CreateAsset(assetType, assetName, *this);
-
-    if (result.HasTakenAction())
-    {
-        if (!result.HasFailed())
-            return result.GetAssetInfo();
-
-        std::cerr << std::format("Could not load asset \"{}\" of type \"{}\"\n", assetName, *m_zone.m_pools->GetAssetTypeName(assetType));
-    }
-    else
-    {
-        std::cerr << std::format("Missing asset \"{}\" of type \"{}\"\n", assetName, *m_zone.m_pools->GetAssetTypeName(assetType));
-    }
-
-    return nullptr;
-}

src/ObjLoading/Asset/AssetCreationContext.h

@@ -65,31 +65,12 @@ public:
 
     IndirectAssetReference LoadIndirectAssetReferenceGeneric(asset_type_t assetType, const std::string& assetName);
 
-    /**
-     * \brief Loads an asset dependency like \c LoadDependency but guarantees that the returned asset is not a reference.
-     * If normally a reference would be created, the actual asset is loaded but a reference is added to the zone.
-     * \tparam AssetType The type of the asset
-     * \param assetName The name of the asset
-     * \return XAssetInfo of the asset that is guaranteed to not be a reference or \c nullptr
-     */
-    template<typename AssetType> XAssetInfo<typename AssetType::Type>* ForceLoadDependency(const std::string& assetName)
-    {
-        static_assert(std::is_base_of_v<IAssetBase, AssetType>);
-
-        return static_cast<XAssetInfo<typename AssetType::Type>*>(ForceLoadDependencyGeneric(AssetType::EnumEntry, assetName));
-    }
-
-    XAssetInfoGeneric* ForceLoadDependencyGeneric(asset_type_t assetType, const std::string& assetName);
-
 private:
     [[nodiscard]] XAssetInfoGeneric* LoadDefaultAssetDependency(asset_type_t assetType, const std::string& assetName);
 
     Zone& m_zone;
-    std::unique_ptr<ZoneAssetPools> m_forced_asset_pools;
     const AssetCreatorCollection* m_creators;
     const IgnoredAssetLookup* m_ignored_asset_lookup;
-
-    unsigned m_forced_load_depth;
 };
 
 #include "AssetCreatorCollection.h"

src/ObjLoading/Game/IW3/Image/AssetLoaderImageIW3.cpp

@@ -81,7 +81,7 @@ namespace
             const auto mipCount = texture->HasMipMaps() ? texture->GetMipMapCount() : 1;
             const auto faceCount = texture->GetFaceCount();
 
-            auto dataSize = 0uz;
+            size_t dataSize = 0;
             for (auto mipLevel = 0; mipLevel < mipCount; mipLevel++)
                 dataSize += texture->GetSizeOfMipLevel(mipLevel) * faceCount;
 
@@ -99,7 +99,7 @@ namespace
             loadDef->dimensions[1] = image->height;
             loadDef->dimensions[2] = image->depth;
             loadDef->format = static_cast<int>(texture->GetFormat()->GetD3DFormat());
-            loadDef->resourceSize = static_cast<unsigned>(dataSize);
+            loadDef->resourceSize = dataSize;
 
             char* currentDataBuffer = loadDef->data;
             for (auto mipLevel = 0; mipLevel < mipCount; mipLevel++)

src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp

@@ -21,7 +21,7 @@ namespace
 {
     void ConfigureDefaultCreators(AssetCreatorCollection& collection, Zone& zone)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         collection.AddDefaultAssetCreator(std::make_unique<DefaultAssetCreator<AssetPhysPreset>>(memory));
         collection.AddDefaultAssetCreator(std::make_unique<DefaultAssetCreator<AssetXAnim>>(memory));
@@ -85,7 +85,7 @@ namespace
 
     void ConfigureLoaders(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         // collection.AddAssetCreator(std::make_unique<AssetLoaderPhysPreset>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderXAnim>(memory));
@@ -96,6 +96,7 @@ namespace
         // collection.AddAssetCreator(std::make_unique<AssetLoaderSound>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderSoundCurve>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderLoadedSound>(memory));
+        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMap>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMapPvs>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderComWorld>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderGameWorldSp>(memory));

src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp

@@ -63,7 +63,7 @@ namespace
                 menuLoadQueue.pop_front();
             }
 
-            auto* menuListAsset = m_memory.Alloc<MenuList>();
+            auto* menuListAsset = m_memory.Create<MenuList>();
             menuListAsset->name = m_memory.Dup(assetName.c_str());
             registration.SetAsset(menuListAsset);
 
@@ -83,7 +83,7 @@ namespace
                                    menu::MenuAssetZoneState& zoneState,
                                    MenuConversionZoneState& conversionState,
                                    std::vector<menuDef_t*>& menus,
-                                   AssetRegistration<AssetMenuList>& registration) const
+                                   AssetRegistration<AssetMenuList>& registration)
         {
             const auto alreadyLoadedMenuFile = conversionState.m_menus_by_filename.find(menuFilePath);
             if (alreadyLoadedMenuFile != conversionState.m_menus_by_filename.end())
@@ -125,12 +125,12 @@ namespace
                                   menu::MenuAssetZoneState& zoneState,
                                   MenuConversionZoneState& conversionState,
                                   std::vector<menuDef_t*>& menus,
-                                  AssetRegistration<AssetMenuList>& registration) const
+                                  AssetRegistration<AssetMenuList>& registration)
         {
             const auto menuCount = parsingResult.m_menus.size();
             const auto functionCount = parsingResult.m_functions.size();
             const auto menuLoadCount = parsingResult.m_menus_to_load.size();
-            auto totalItemCount = 0uz;
+            auto totalItemCount = 0u;
             for (const auto& menu : parsingResult.m_menus)
                 totalItemCount += menu->m_items.size();
 
@@ -182,7 +182,7 @@ namespace
             return true;
         }
 
-        void CreateMenuListAsset(MenuList& menuList, const std::vector<menuDef_t*>& menus) const
+        void CreateMenuListAsset(MenuList& menuList, const std::vector<menuDef_t*>& menus)
         {
             menuList.menuCount = static_cast<int>(menus.size());
 
@@ -196,8 +196,7 @@ namespace
                 menuList.menus = nullptr;
         }
 
-        std::unique_ptr<menu::ParsingResult>
+        std::unique_ptr<menu::ParsingResult> ParseMenuFile(std::istream& stream, const std::string& menuFileName, const menu::MenuAssetZoneState& zoneState)
-            ParseMenuFile(std::istream& stream, const std::string& menuFileName, const menu::MenuAssetZoneState& zoneState) const
         {
             menu::MenuFileReader reader(stream, menuFileName, menu::FeatureLevel::IW4, m_search_path);
 

src/ObjLoading/Game/IW4/Menu/MenuConversionZoneStateIW4.cpp

@@ -12,10 +12,11 @@ MenuConversionZoneState::MenuConversionZoneState()
 
 void MenuConversionZoneState::Inject(ZoneAssetCreationInjection& inject)
 {
-    auto& memory = inject.m_zone.Memory();
+    auto* memory = inject.m_zone.GetMemory();
 
     m_zone = &inject.m_zone;
-    m_supporting_data = memory.Alloc<ExpressionSupportingData>();
+    m_supporting_data = memory->Create<ExpressionSupportingData>();
+    memset(m_supporting_data, 0, sizeof(ExpressionSupportingData));
 }
 
 Statement_s* MenuConversionZoneState::FindFunction(const std::string& functionName)
@@ -43,10 +44,10 @@ size_t MenuConversionZoneState::AddStaticDvar(const std::string& dvarName)
     if (foundDvar != m_dvars_by_name.end())
         return foundDvar->second;
 
-    auto& memory = m_zone->Memory();
+    auto* memory = m_zone->GetMemory();
-    auto* staticDvar = memory.Alloc<StaticDvar>();
+    auto* staticDvar = memory->Alloc<StaticDvar>();
 
-    staticDvar->dvarName = memory.Dup(dvarName.c_str());
+    staticDvar->dvarName = memory->Dup(dvarName.c_str());
     staticDvar->dvar = nullptr;
 
     const auto staticDvarIndex = m_static_dvars.size();
@@ -63,8 +64,8 @@ const char* MenuConversionZoneState::AddString(const std::string& str)
     if (foundString != m_strings_by_value.end())
         return foundString->second;
 
-    auto& memory = m_zone->Memory();
+    auto* memory = m_zone->GetMemory();
-    const auto* strDuped = memory.Dup(str.c_str());
+    const auto* strDuped = memory->Dup(str.c_str());
 
     m_strings.push_back(strDuped);
     m_strings_by_value.emplace(std::make_pair(str, strDuped));
@@ -79,24 +80,24 @@ void MenuConversionZoneState::AddLoadedFile(std::string loadedFileName, std::vec
 
 void MenuConversionZoneState::FinalizeSupportingData() const
 {
-    auto& memory = m_zone->Memory();
+    auto* memory = m_zone->GetMemory();
 
     m_supporting_data->uifunctions.totalFunctions = static_cast<int>(m_functions.size());
     m_supporting_data->staticDvarList.numStaticDvars = static_cast<int>(m_static_dvars.size());
     m_supporting_data->uiStrings.totalStrings = static_cast<int>(m_strings.size());
 
     if (m_supporting_data->uifunctions.functions)
-        memory.Free(m_supporting_data->uifunctions.functions);
+        memory->Free(m_supporting_data->uifunctions.functions);
 
     if (m_supporting_data->staticDvarList.staticDvars)
-        memory.Free(m_supporting_data->staticDvarList.staticDvars);
+        memory->Free(m_supporting_data->staticDvarList.staticDvars);
 
     if (m_supporting_data->uiStrings.strings)
-        memory.Free(m_supporting_data->uiStrings.strings);
+        memory->Free(m_supporting_data->uiStrings.strings);
 
     if (!m_functions.empty())
     {
-        m_supporting_data->uifunctions.functions = memory.Alloc<Statement_s*>(m_functions.size());
+        m_supporting_data->uifunctions.functions = memory->Alloc<Statement_s*>(m_functions.size());
         memcpy(m_supporting_data->uifunctions.functions, m_functions.data(), sizeof(void*) * m_functions.size());
     }
     else
@@ -104,7 +105,7 @@ void MenuConversionZoneState::FinalizeSupportingData() const
 
     if (!m_static_dvars.empty())
     {
-        m_supporting_data->staticDvarList.staticDvars = memory.Alloc<StaticDvar*>(m_static_dvars.size());
+        m_supporting_data->staticDvarList.staticDvars = memory->Alloc<StaticDvar*>(m_static_dvars.size());
         memcpy(m_supporting_data->staticDvarList.staticDvars, m_static_dvars.data(), sizeof(void*) * m_static_dvars.size());
     }
     else
@@ -112,7 +113,7 @@ void MenuConversionZoneState::FinalizeSupportingData() const
 
     if (!m_strings.empty())
     {
-        m_supporting_data->uiStrings.strings = memory.Alloc<const char*>(m_strings.size());
+        m_supporting_data->uiStrings.strings = memory->Alloc<const char*>(m_strings.size());
         memcpy(m_supporting_data->uiStrings.strings, m_strings.data(), sizeof(void*) * m_strings.size());
     }
     else

src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp

@@ -34,7 +34,7 @@ namespace
 {
     void ConfigureDefaultCreators(AssetCreatorCollection& collection, Zone& zone)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         collection.AddDefaultAssetCreator(std::make_unique<DefaultAssetCreator<AssetPhysPreset>>(memory));
         collection.AddDefaultAssetCreator(std::make_unique<DefaultAssetCreator<AssetPhysCollMap>>(memory));
@@ -118,7 +118,7 @@ namespace
 
     void ConfigureLoaders(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         collection.AddAssetCreator(std::make_unique<RawLoaderPhysPreset>(memory, searchPath, zone));
         collection.AddAssetCreator(std::make_unique<GdtLoaderPhysPreset>(memory, gdt, zone));
@@ -135,7 +135,8 @@ namespace
         // collection.AddAssetCreator(std::make_unique<AssetLoaderSound>(memory));
         collection.AddAssetCreator(CreateSoundCurveLoader(memory, searchPath));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderLoadedSound>(memory));
-        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMap>(memory));
+        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMapSp>(memory));
+        // collection.AddAssetCreator(std::make_unique<AssetLoaderClipMapMp>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderComWorld>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderGameWorldSp>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderGameWorldMp>(memory));

src/ObjLoading/Game/IW4/RawFile/LoaderRawFileIW4.cpp

@@ -43,7 +43,7 @@ namespace
             zs.zfree = Z_NULL;
             zs.opaque = Z_NULL;
             zs.avail_in = static_cast<uInt>(file.m_length);
-            zs.avail_out = static_cast<unsigned>(compressionBufferSize);
+            zs.avail_out = compressionBufferSize;
             zs.next_in = reinterpret_cast<const Bytef*>(uncompressedBuffer.get());
             zs.next_out = reinterpret_cast<Bytef*>(compressedBuffer);
 

src/ObjLoading/Game/IW4/StructuredDataDef/LoaderStructuredDataDefIW4.cpp

@@ -38,38 +38,38 @@ namespace
         }
 
     private:
-        static StructuredDataType ConvertType(const CommonStructuredDataType inputType)
+        StructuredDataType ConvertType(CommonStructuredDataType inputType)
         {
             switch (inputType.m_category)
             {
             case CommonStructuredDataTypeCategory::INT:
-                return {.type = DATA_INT, .u = {}};
+                return {DATA_INT, {0}};
             case CommonStructuredDataTypeCategory::BYTE:
-                return {.type = DATA_BYTE, .u = {}};
+                return {DATA_BYTE, {0}};
             case CommonStructuredDataTypeCategory::BOOL:
-                return {.type = DATA_BOOL, .u = {}};
+                return {DATA_BOOL, {0}};
             case CommonStructuredDataTypeCategory::FLOAT:
-                return {.type = DATA_FLOAT, .u = {}};
+                return {DATA_FLOAT, {0}};
             case CommonStructuredDataTypeCategory::SHORT:
-                return {.type = DATA_SHORT, .u = {}};
+                return {DATA_SHORT, {0}};
             case CommonStructuredDataTypeCategory::STRING:
-                return {.type = DATA_STRING, .u = {static_cast<unsigned>(inputType.m_info.string_length)}};
+                return {DATA_STRING, {inputType.m_info.string_length}};
             case CommonStructuredDataTypeCategory::ENUM:
-                return {.type = DATA_ENUM, .u = {static_cast<unsigned>(inputType.m_info.type_index)}};
+                return {DATA_ENUM, {inputType.m_info.type_index}};
             case CommonStructuredDataTypeCategory::STRUCT:
-                return {.type = DATA_STRUCT, .u = {static_cast<unsigned>(inputType.m_info.type_index)}};
+                return {DATA_STRUCT, {inputType.m_info.type_index}};
             case CommonStructuredDataTypeCategory::INDEXED_ARRAY:
-                return {.type = DATA_INDEXED_ARRAY, .u = {static_cast<unsigned>(inputType.m_info.type_index)}};
+                return {DATA_INDEXED_ARRAY, {inputType.m_info.type_index}};
             case CommonStructuredDataTypeCategory::ENUM_ARRAY:
-                return {.type = DATA_ENUM_ARRAY, .u = {static_cast<unsigned>(inputType.m_info.type_index)}};
+                return {DATA_ENUM_ARRAY, {inputType.m_info.type_index}};
             case CommonStructuredDataTypeCategory::UNKNOWN:
             default:
                 assert(false);
-                return {.type = DATA_INT, .u = {0}};
+                return {DATA_INT, {0}};
             }
         }
 
-        void ConvertEnum(CommonStructuredDataEnum& inputEnum, StructuredDataEnum& outputEnum) const
+        void ConvertEnum(CommonStructuredDataEnum& inputEnum, StructuredDataEnum& outputEnum)
         {
             outputEnum.entryCount = static_cast<int>(inputEnum.m_entries.size());
             if (inputEnum.m_reserved_entry_count <= 0)
@@ -94,10 +94,10 @@ namespace
                 outputEnum.entries = nullptr;
         }
 
-        void ConvertStruct(CommonStructuredDataStruct& inputStruct, StructuredDataStruct& outputStruct) const
+        void ConvertStruct(CommonStructuredDataStruct& inputStruct, StructuredDataStruct& outputStruct)
         {
             outputStruct.size = static_cast<int>(inputStruct.m_size_in_byte);
-            outputStruct.bitOffset = static_cast<unsigned>(inputStruct.m_bit_offset);
+            outputStruct.bitOffset = inputStruct.m_bit_offset;
 
             outputStruct.propertyCount = static_cast<int>(inputStruct.m_properties.size());
             inputStruct.SortPropertiesByName();
@@ -115,34 +115,34 @@ namespace
                     if (outputProperty.type.type != DATA_BOOL)
                     {
                         assert(inputProperty.m_offset_in_bits % 8 == 0);
-                        outputProperty.offset = static_cast<unsigned>(inputProperty.m_offset_in_bits / 8uz);
+                        outputProperty.offset = inputProperty.m_offset_in_bits / 8;
                     }
                     else
-                        outputProperty.offset = static_cast<unsigned>(inputProperty.m_offset_in_bits);
+                        outputProperty.offset = inputProperty.m_offset_in_bits;
                 }
             }
             else
                 outputStruct.properties = nullptr;
         }
 
-        static void ConvertIndexedArray(const CommonStructuredDataIndexedArray& inputIndexedArray, StructuredDataIndexedArray& outputIndexedArray)
+        void ConvertIndexedArray(const CommonStructuredDataIndexedArray& inputIndexedArray, StructuredDataIndexedArray& outputIndexedArray)
         {
             outputIndexedArray.arraySize = static_cast<int>(inputIndexedArray.m_element_count);
             outputIndexedArray.elementType = ConvertType(inputIndexedArray.m_array_type);
-            outputIndexedArray.elementSize = static_cast<unsigned>(utils::Align(inputIndexedArray.m_element_size_in_bits, 8uz) / 8uz);
+            outputIndexedArray.elementSize = utils::Align(inputIndexedArray.m_element_size_in_bits, 8u) / 8u;
         }
 
         void ConvertEnumedArray(const CommonStructuredDataEnumedArray& inputEnumedArray, StructuredDataEnumedArray& outputEnumedArray)
         {
             outputEnumedArray.enumIndex = static_cast<int>(inputEnumedArray.m_enum_index);
             outputEnumedArray.elementType = ConvertType(inputEnumedArray.m_array_type);
-            outputEnumedArray.elementSize = static_cast<unsigned>(utils::Align(inputEnumedArray.m_element_size_in_bits, 8uz) / 8uz);
+            outputEnumedArray.elementSize = utils::Align(inputEnumedArray.m_element_size_in_bits, 8u) / 8u;
         }
 
         void ConvertDef(const CommonStructuredDataDef& inputDef, StructuredDataDef& outputDef)
         {
             outputDef.version = inputDef.m_version;
-            outputDef.formatChecksum = static_cast<unsigned>(inputDef.m_checksum);
+            outputDef.formatChecksum = inputDef.m_checksum;
 
             outputDef.enumCount = static_cast<int>(inputDef.m_enums.size());
             if (!inputDef.m_enums.empty())
@@ -185,7 +185,7 @@ namespace
                 outputDef.enumedArrays = nullptr;
 
             outputDef.rootType = ConvertType(inputDef.m_root_type);
-            outputDef.size = static_cast<unsigned>(inputDef.m_size_in_byte);
+            outputDef.size = inputDef.m_size_in_byte;
         }
 
         StructuredDataDefSet* ConvertSet(const std::string& assetName, const std::vector<std::unique_ptr<CommonStructuredDataDef>>& commonDefs)
@@ -193,7 +193,7 @@ namespace
             auto* set = m_memory.Alloc<StructuredDataDefSet>();
             set->name = m_memory.Dup(assetName.c_str());
 
-            set->defCount = static_cast<unsigned>(commonDefs.size());
+            set->defCount = commonDefs.size();
             set->defs = m_memory.Alloc<StructuredDataDef>(commonDefs.size());
 
             for (auto defIndex = 0u; defIndex < commonDefs.size(); defIndex++)

src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp

@@ -31,14 +31,14 @@ namespace
     class LoadedTechnique
     {
     public:
+        MaterialTechnique* m_technique;
+        std::vector<XAssetInfoGeneric*> m_dependencies;
+
         LoadedTechnique(MaterialTechnique* technique, std::vector<XAssetInfoGeneric*> dependencies)
             : m_technique(technique),
               m_dependencies(std::move(dependencies))
         {
         }
-
-        MaterialTechnique* m_technique;
-        std::vector<XAssetInfoGeneric*> m_dependencies;
     };
 
     class TechniqueZoneLoadingState final : public IZoneAssetCreationState
@@ -46,7 +46,8 @@ namespace
     public:
         typedef const float (*literal_t)[4];
 
-        [[nodiscard]] const LoadedTechnique* FindLoadedTechnique(const std::string& techniqueName) const
+    public:
+        _NODISCARD const LoadedTechnique* FindLoadedTechnique(const std::string& techniqueName) const
         {
             const auto loadedTechnique = m_loaded_techniques.find(techniqueName);
             if (loadedTechnique != m_loaded_techniques.end())
@@ -85,6 +86,8 @@ namespace
 
     class ShaderInfoFromFileSystemCacheState final : public IZoneAssetCreationState
     {
+        std::unordered_map<std::string, std::unique_ptr<d3d9::ShaderInfo>> m_cached_shader_info;
+
     public:
         [[nodiscard]] const d3d9::ShaderInfo* LoadShaderInfoFromDisk(ISearchPath& searchPath, const std::string& fileName)
         {
@@ -105,9 +108,9 @@ namespace
             }
 
             const auto shaderData = std::make_unique<char[]>(shaderSize);
-            file.m_stream->read(shaderData.get(), static_cast<std::streamsize>(shaderSize));
+            file.m_stream->read(shaderData.get(), shaderSize);
 
-            auto shaderInfo = d3d9::ShaderAnalyser::GetShaderInfo(shaderData.get(), shaderSize);
+            auto shaderInfo = d3d9::ShaderAnalyser::GetShaderInfo(reinterpret_cast<const uint32_t*>(shaderData.get()), shaderSize);
             if (!shaderInfo)
                 return nullptr;
 
@@ -115,9 +118,6 @@ namespace
             m_cached_shader_info.emplace(std::make_pair(fileName, std::move(shaderInfo)));
             return result;
         }
-
-    private:
-        std::unordered_map<std::string, std::unique_ptr<d3d9::ShaderInfo>> m_cached_shader_info;
     };
 
     class TechniqueCreator final : public techset::ITechniqueDefinitionAcceptor
@@ -126,13 +126,10 @@ namespace
         class PassShaderArgument
         {
         public:
-            explicit PassShaderArgument(const MaterialShaderArgument arg)
+            MaterialShaderArgument m_arg;
-                : m_arg(arg),
+            MaterialUpdateFrequency m_update_frequency;
-                  m_update_frequency(GetUpdateFrequencyForArg(arg))
-            {
-            }
 
-            static MaterialUpdateFrequency GetUpdateFrequencyForArg(const MaterialShaderArgument arg)
+            static MaterialUpdateFrequency GetUpdateFrequencyForArg(MaterialShaderArgument arg)
             {
                 switch (arg.type)
                 {
@@ -163,22 +160,15 @@ namespace
                 }
             }
 
-            MaterialShaderArgument m_arg;
+            explicit PassShaderArgument(const MaterialShaderArgument arg)
-            MaterialUpdateFrequency m_update_frequency;
+                : m_arg(arg),
+                  m_update_frequency(GetUpdateFrequencyForArg(arg))
+            {
+            }
         };
 
         struct Pass
         {
-            Pass()
-                : m_vertex_shader(nullptr),
-                  m_vertex_shader_info(nullptr),
-                  m_pixel_shader(nullptr),
-                  m_pixel_shader_info(nullptr),
-                  m_vertex_decl{},
-                  m_vertex_decl_asset(nullptr)
-            {
-            }
-
             XAssetInfo<MaterialVertexShader>* m_vertex_shader;
             const d3d9::ShaderInfo* m_vertex_shader_info;
             std::unique_ptr<d3d9::ShaderInfo> m_vertex_shader_info_unq;
@@ -194,8 +184,21 @@ namespace
             MaterialVertexDeclaration m_vertex_decl;
             XAssetInfo<MaterialVertexDeclaration>* m_vertex_decl_asset;
             std::vector<PassShaderArgument> m_arguments;
+
+            Pass()
+                : m_vertex_shader(nullptr),
+                  m_vertex_shader_info(nullptr),
+                  m_pixel_shader(nullptr),
+                  m_pixel_shader_info(nullptr),
+                  m_vertex_decl{},
+                  m_vertex_decl_asset(nullptr)
+            {
+            }
         };
 
+        std::vector<Pass> m_passes;
+        std::vector<XAssetInfoGeneric*> m_dependencies;
+
         TechniqueCreator(
             const std::string& techniqueName, ISearchPath& searchPath, MemoryManager& memory, AssetCreationContext& context, ITechsetCreator* techsetCreator)
             : m_technique_name(techniqueName),
@@ -214,11 +217,10 @@ namespace
             m_passes.emplace_back();
         }
 
-        static unsigned RegisterCountPerElement(const d3d9::ShaderConstant& constant)
+        static size_t RegisterCountPerElement(const d3d9::ShaderConstant& constant)
         {
             const auto valuesPerRegister =
                 constant.m_register_set == d3d9::RegisterSet::BOOL || constant.m_register_set == d3d9::RegisterSet::SAMPLER ? 1u : 4u;
-
             return utils::Align(constant.m_type_columns * constant.m_type_rows, valuesPerRegister) / valuesPerRegister;
         }
 
@@ -241,7 +243,7 @@ namespace
             if (shaderType == techset::ShaderSelector::VERTEX_SHADER && isSamplerArgument)
                 return false;
 
-            MaterialShaderArgument argument;
+            MaterialShaderArgument argument{};
             argument.dest = static_cast<uint16_t>(shaderArgument.m_register_index + registerOffset);
 
             unsigned arrayCount;
@@ -256,7 +258,7 @@ namespace
                     return false;
 
                 argument.type = MTL_ARG_CODE_PIXEL_SAMPLER;
-                argument.u.codeSampler = samplerSource->source + static_cast<unsigned>(elementOffset);
+                argument.u.codeSampler = samplerSource->source + elementOffset;
 
                 arrayCount = static_cast<unsigned>(samplerSource->arrayCount);
             }
@@ -302,12 +304,13 @@ namespace
                     {
                         if (!AutoCreateShaderArgument(techset::ShaderSelector::VERTEX_SHADER, argument, elementIndex, registerIndex))
                         {
-                            std::string elementIndexStr;
+                            std::ostringstream ss;
-                            if (argument.m_type_elements > 1)
+                            ss << "Unassigned vertex shader \"" << pass.m_vertex_shader->m_name << "\" arg: " << argument.m_name;
-                                elementIndexStr = std::format("[{}]", elementIndex);
 
-                            errorMessage =
+                            if (argument.m_type_elements > 1)
-                                std::format("Unassigned vertex shader \"{}\" arg: {}{}", pass.m_vertex_shader->m_name, argument.m_name, elementIndexStr);
+                                ss << '[' << elementIndex << ']';
+
+                            errorMessage = ss.str();
                             return false;
                         }
                     }
@@ -569,11 +572,11 @@ namespace
             return foundSource;
         }
 
-        static bool FindShaderArgument(const d3d9::ShaderInfo& shaderInfo,
+        bool FindShaderArgument(const d3d9::ShaderInfo& shaderInfo,
-                                       const techset::ShaderArgument& argument,
+                                const techset::ShaderArgument& argument,
-                                       size_t& constantIndex,
+                                size_t& constantIndex,
-                                       size_t& registerOffset,
+                                size_t& registerOffset,
-                                       std::string& errorMessage)
+                                std::string& errorMessage) const
         {
             const auto matchingShaderConstant = std::ranges::find_if(shaderInfo.m_constants,
                                                                      [argument](const d3d9::ShaderConstant& constant)
@@ -851,14 +854,14 @@ namespace
         }
 
         bool AcceptShaderLiteralArgument(const techset::ShaderSelector shader,
-                                         const techset::ShaderArgument shaderArgument,
+                                         techset::ShaderArgument shaderArgument,
-                                         const techset::ShaderArgumentLiteralSource source,
+                                         techset::ShaderArgumentLiteralSource source,
                                          std::string& errorMessage) override
         {
             assert(!m_passes.empty());
             auto& pass = m_passes.at(m_passes.size() - 1);
 
-            MaterialShaderArgument argument;
+            MaterialShaderArgument argument{};
             const d3d9::ShaderInfo* shaderInfo;
 
             if (shader == techset::ShaderSelector::VERTEX_SHADER)
@@ -910,14 +913,14 @@ namespace
         }
 
         bool AcceptShaderMaterialArgument(const techset::ShaderSelector shader,
-                                          const techset::ShaderArgument shaderArgument,
+                                          techset::ShaderArgument shaderArgument,
                                           const techset::ShaderArgumentMaterialSource source,
                                           std::string& errorMessage) override
         {
             assert(!m_passes.empty());
             auto& pass = m_passes.at(m_passes.size() - 1);
 
-            MaterialShaderArgument argument;
+            MaterialShaderArgument argument{};
             const d3d9::ShaderInfo* shaderInfo;
 
             if (shader == techset::ShaderSelector::VERTEX_SHADER)
@@ -1013,8 +1016,6 @@ namespace
             return true;
         }
 
-        std::vector<Pass> m_passes;
-
     private:
         const std::string& m_technique_name;
         ISearchPath& m_search_path;

src/ObjLoading/Game/IW5/Material/JsonMaterialLoader.cpp

@@ -1,8 +1,8 @@
 #include "JsonMaterialLoader.h"
 
-#include "Base64.h"
 #include "Game/IW5/CommonIW5.h"
 #include "Game/IW5/Material/JsonMaterial.h"
+#include "Impl/Base64.h"
 
 #include <format>
 #include <iostream>

src/ObjLoading/Game/IW5/Menu/LoaderMenuListIW5.cpp

@@ -63,7 +63,7 @@ namespace
                 menuLoadQueue.pop_front();
             }
 
-            auto* menuListAsset = m_memory.Alloc<MenuList>();
+            auto* menuListAsset = m_memory.Create<MenuList>();
             menuListAsset->name = m_memory.Dup(assetName.c_str());
             registration.SetAsset(menuListAsset);
 
@@ -83,7 +83,7 @@ namespace
                                    menu::MenuAssetZoneState& zoneState,
                                    MenuConversionZoneState& conversionState,
                                    std::vector<menuDef_t*>& menus,
-                                   AssetRegistration<AssetMenuList>& registration) const
+                                   AssetRegistration<AssetMenuList>& registration)
         {
             const auto alreadyLoadedMenuFile = conversionState.m_menus_by_filename.find(menuFilePath);
             if (alreadyLoadedMenuFile != conversionState.m_menus_by_filename.end())
@@ -125,14 +125,14 @@ namespace
                                   menu::MenuAssetZoneState& zoneState,
                                   MenuConversionZoneState& conversionState,
                                   std::vector<menuDef_t*>& menus,
-                                  AssetRegistration<AssetMenuList>& registration) const
+                                  AssetRegistration<AssetMenuList>& registration)
         {
             const auto menuCount = parsingResult.m_menus.size();
             const auto functionCount = parsingResult.m_functions.size();
             const auto menuLoadCount = parsingResult.m_menus_to_load.size();
             auto totalItemCount = 0u;
             for (const auto& menu : parsingResult.m_menus)
-                totalItemCount += static_cast<unsigned>(menu->m_items.size());
+                totalItemCount += menu->m_items.size();
 
             std::cout << std::format("Successfully read menu file \"{}\" ({} loads, {} menus, {} functions, {} items)\n",
                                      fileName,
@@ -152,7 +152,7 @@ namespace
             // Convert all menus and add them as assets
             for (auto& commonMenu : parsingResult.m_menus)
             {
-                const auto converter = IMenuConverter::Create(ObjLoading::Configuration.MenuNoOptimization, m_search_path, m_memory, context);
+                auto converter = IMenuConverter::Create(ObjLoading::Configuration.MenuNoOptimization, m_search_path, m_memory, context);
 
                 auto* menuAsset = m_memory.Alloc<menuDef_t>();
                 AssetRegistration<AssetMenu> menuRegistration(commonMenu->m_name, menuAsset);
@@ -182,7 +182,7 @@ namespace
             return true;
         }
 
-        void CreateMenuListAsset(MenuList& menuList, const std::vector<menuDef_t*>& menus) const
+        void CreateMenuListAsset(MenuList& menuList, const std::vector<menuDef_t*>& menus)
         {
             menuList.menuCount = static_cast<int>(menus.size());
 
@@ -196,8 +196,7 @@ namespace
                 menuList.menus = nullptr;
         }
 
-        std::unique_ptr<menu::ParsingResult>
+        std::unique_ptr<menu::ParsingResult> ParseMenuFile(std::istream& stream, const std::string& menuFileName, const menu::MenuAssetZoneState& zoneState)
-            ParseMenuFile(std::istream& stream, const std::string& menuFileName, const menu::MenuAssetZoneState& zoneState) const
         {
             menu::MenuFileReader reader(stream, menuFileName, menu::FeatureLevel::IW5, m_search_path);
 

src/ObjLoading/Game/IW5/Menu/MenuConversionZoneStateIW5.cpp

@@ -12,10 +12,11 @@ MenuConversionZoneState::MenuConversionZoneState()
 
 void MenuConversionZoneState::Inject(ZoneAssetCreationInjection& inject)
 {
-    auto& memory = inject.m_zone.Memory();
+    auto* memory = inject.m_zone.GetMemory();
 
     m_zone = &inject.m_zone;
-    m_supporting_data = memory.Alloc<ExpressionSupportingData>();
+    m_supporting_data = memory->Create<ExpressionSupportingData>();
+    memset(m_supporting_data, 0, sizeof(ExpressionSupportingData));
 }
 
 Statement_s* MenuConversionZoneState::FindFunction(const std::string& functionName)
@@ -43,10 +44,10 @@ size_t MenuConversionZoneState::AddStaticDvar(const std::string& dvarName)
     if (foundDvar != m_dvars_by_name.end())
         return foundDvar->second;
 
-    auto& memory = m_zone->Memory();
+    auto* memory = m_zone->GetMemory();
-    auto* staticDvar = memory.Alloc<StaticDvar>();
+    auto* staticDvar = memory->Alloc<StaticDvar>();
 
-    staticDvar->dvarName = memory.Dup(dvarName.c_str());
+    staticDvar->dvarName = memory->Dup(dvarName.c_str());
     staticDvar->dvar = nullptr;
 
     const auto staticDvarIndex = m_static_dvars.size();
@@ -63,8 +64,8 @@ const char* MenuConversionZoneState::AddString(const std::string& str)
     if (foundString != m_strings_by_value.end())
         return foundString->second;
 
-    auto& memory = m_zone->Memory();
+    auto* memory = m_zone->GetMemory();
-    const auto* strDuped = memory.Dup(str.c_str());
+    const auto* strDuped = memory->Dup(str.c_str());
 
     m_strings.push_back(strDuped);
     m_strings_by_value.emplace(std::make_pair(str, strDuped));
@@ -79,24 +80,24 @@ void MenuConversionZoneState::AddLoadedFile(std::string loadedFileName, std::vec
 
 void MenuConversionZoneState::FinalizeSupportingData() const
 {
-    auto& memory = m_zone->Memory();
+    auto* memory = m_zone->GetMemory();
 
     m_supporting_data->uifunctions.totalFunctions = static_cast<int>(m_functions.size());
     m_supporting_data->staticDvarList.numStaticDvars = static_cast<int>(m_static_dvars.size());
     m_supporting_data->uiStrings.totalStrings = static_cast<int>(m_strings.size());
 
     if (m_supporting_data->uifunctions.functions)
-        memory.Free(m_supporting_data->uifunctions.functions);
+        memory->Free(m_supporting_data->uifunctions.functions);
 
     if (m_supporting_data->staticDvarList.staticDvars)
-        memory.Free(m_supporting_data->staticDvarList.staticDvars);
+        memory->Free(m_supporting_data->staticDvarList.staticDvars);
 
     if (m_supporting_data->uiStrings.strings)
-        memory.Free(m_supporting_data->uiStrings.strings);
+        memory->Free(m_supporting_data->uiStrings.strings);
 
     if (!m_functions.empty())
     {
-        m_supporting_data->uifunctions.functions = memory.Alloc<Statement_s*>(m_functions.size());
+        m_supporting_data->uifunctions.functions = memory->Alloc<Statement_s*>(m_functions.size());
         memcpy(m_supporting_data->uifunctions.functions, m_functions.data(), sizeof(void*) * m_functions.size());
     }
     else
@@ -104,7 +105,7 @@ void MenuConversionZoneState::FinalizeSupportingData() const
 
     if (!m_static_dvars.empty())
     {
-        m_supporting_data->staticDvarList.staticDvars = memory.Alloc<StaticDvar*>(m_static_dvars.size());
+        m_supporting_data->staticDvarList.staticDvars = memory->Alloc<StaticDvar*>(m_static_dvars.size());
         memcpy(m_supporting_data->staticDvarList.staticDvars, m_static_dvars.data(), sizeof(void*) * m_static_dvars.size());
     }
     else
@@ -112,7 +113,7 @@ void MenuConversionZoneState::FinalizeSupportingData() const
 
     if (!m_strings.empty())
     {
-        m_supporting_data->uiStrings.strings = memory.Alloc<const char*>(m_strings.size());
+        m_supporting_data->uiStrings.strings = memory->Alloc<const char*>(m_strings.size());
         memcpy(m_supporting_data->uiStrings.strings, m_strings.data(), sizeof(void*) * m_strings.size());
     }
     else

src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp

@@ -29,7 +29,7 @@ namespace
 {
     void ConfigureDefaultCreators(AssetCreatorCollection& collection, Zone& zone)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         collection.AddDefaultAssetCreator(std::make_unique<DefaultAssetCreator<AssetPhysPreset>>(memory));
         collection.AddDefaultAssetCreator(std::make_unique<DefaultAssetCreator<AssetPhysCollMap>>(memory));
@@ -119,7 +119,7 @@ namespace
 
     void ConfigureLoaders(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt)
     {
-        auto& memory = zone.Memory();
+        auto& memory = *zone.GetMemory();
 
         // collection.AddAssetCreator(std::make_unique<AssetLoaderPhysPreset>(memory));
         // collection.AddAssetCreator(std::make_unique<AssetLoaderPhysCollMap>(memory));

src/ObjLoading/Game/IW5/RawFile/LoaderRawFileIW5.cpp

@@ -44,7 +44,7 @@ namespace
             zs.zfree = Z_NULL;
             zs.opaque = Z_NULL;
             zs.avail_in = static_cast<uInt>(file.m_length);
-            zs.avail_out = static_cast<unsigned>(compressionBufferSize);
+            zs.avail_out = compressionBufferSize;
             zs.next_in = reinterpret_cast<const Bytef*>(uncompressedBuffer.get());
             zs.next_out = reinterpret_cast<Bytef*>(compressedBuffer);
 

src/ObjLoading/Game/IW5/Script/LoaderScriptFileIW5.cpp

@@ -57,7 +57,7 @@ namespace
                 return AssetCreationResult::Failure();
             }
 
-            if (offset + static_cast<size_t>(scriptFile->compressedLen + scriptFile->bytecodeLen) > static_cast<size_t>(file.m_length))
+            if (offset + (scriptFile->compressedLen + scriptFile->bytecodeLen) > file.m_length)
             {
                 std::cerr << std::format("Error: Specified length in {} GSC BIN structure exceeds the actual file size\n", assetName);
                 return AssetCreationResult::Failure();